au_core_test_kit 1.4.0 → 1.4.2

data/lib/au_core_test_kit/generated/v2.0.0/heartrate/heartrate_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 HeartrateStatusMultipleOrSearchTest < Inferno::Test
-      include AUCoreTestKit::SearchTest
+      include InfernoSuiteGenerator::SearchTest
 
       title '(SHOULD) Server returns valid results for Observation multipleOr search by status'
       description %(A server SHOULD support searching by multipleOr
@@ -15,7 +15,7 @@ status on the Observation 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_heartrate_status_multiple_or_search_test
@@ -28,13 +28,13 @@ 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: 'Observation',
-                                                 search_param_names: ['status'],
-                                                 multiple_or_search_params: true)
+        @properties ||= InfernoSuiteGenerator::SearchTestProperties.new(resource_type: 'Observation',
+                                                                        search_param_names: ['status'],
+                                                                        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/heartrate/heartrate_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 HeartrateStatusSearchTest < Inferno::Test
-      include AUCoreTestKit::SearchTest
+      include InfernoSuiteGenerator::SearchTest
 
       title '(MAY) Server returns valid results for Observation search by status'
       description %(
@@ -16,28 +16,38 @@ status on the Observation 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_heartrate_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: 'Observation',
           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[:heartrate_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/heartrate/heartrate_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 HeartrateValidationTest < Inferno::Test
-      include AUCoreTestKit::ValidationTest
+      include InfernoSuiteGenerator::ValidationTest
 
       id :au_core_v200_heartrate_validation_test
       title 'Observation resources returned during previous tests conform to the AU Core Heart Rate'
@@ -31,6 +31,10 @@ fail if their code/system are not found in the valueset.
         scratch[:heartrate_resources] ||= {}
       end
 
+      def filter_set
+        []
+      end
+
       run do
         perform_validation_test(scratch_resources[:all] || [],
                                 'http://hl7.org.au/fhir/core/StructureDefinition/au-core-heartrate',

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

@@ -245,6 +245,8 @@
 - :path: Observation.subject
   :profiles:
   - http://hl7.org.au/fhir/core/StructureDefinition/au-core-patient
+  :resource_types:
+  - Patient
 - :path: Observation.focus
   :profiles:
   - http://hl7.org/fhir/StructureDefinition/Resource|4.0.1

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

@@ -1,5 +1,6 @@
 # frozen_string_literal: true
 
+require 'inferno_suite_generator/core/ig_demodata'
 require_relative 'heartrate/heartrate_patient_code_search_test'
 require_relative 'heartrate/heartrate_category_search_test'
 require_relative 'heartrate/heartrate_code_search_test'
@@ -86,7 +87,7 @@ read succeeds.
       run_as_group
 
       def self.metadata
-        @metadata ||= Generator::GroupMetadata.new(YAML.load_file(File.join(__dir__, 'heartrate', 'metadata.yml'), aliases: true))
+        @metadata ||= InfernoSuiteGenerator::Generator::GroupMetadata.new(YAML.load_file(File.join(__dir__, 'heartrate', 'metadata.yml'), aliases: true))
       end
 
       test from: :au_core_v200_heartrate_patient_code_search_test

data/lib/au_core_test_kit/generated/v2.0.0/immunization/immunization_date_multiple_and_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 ImmunizationDateMultipleAndSearchTest < Inferno::Test
-      include AUCoreTestKit::SearchTest
+      include InfernoSuiteGenerator::SearchTest
 
       title '(SHOULD) Server returns valid results for Immunization multipleAnd search by date'
       description %(A server SHOULD support searching by multipleAnd
@@ -15,7 +15,7 @@ date on the Immunization 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_immunization_date_multiple_and_search_test
@@ -28,13 +28,13 @@ 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: 'Immunization',
-                                                 search_param_names: ['date'],
-                                                 optional_multiple_and_search_params: true)
+        @properties ||= InfernoSuiteGenerator::SearchTestProperties.new(resource_type: 'Immunization',
+                                                                        search_param_names: ['date'],
+                                                                        optional_multiple_and_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/immunization/immunization_date_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 ImmunizationDateSearchTest < Inferno::Test
-      include AUCoreTestKit::SearchTest
+      include InfernoSuiteGenerator::SearchTest
 
       title '(MAY) Server returns valid results for Immunization search by date'
       description %(
@@ -16,15 +16,21 @@ date on the Immunization 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_immunization_date_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: 'Immunization',
           search_param_names: ['date'],
           possible_status_search: true,
@@ -33,13 +39,17 @@ none are returned, the test is skipped.
       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[:immunization_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/immunization/immunization_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 ImmunizationMustSupportTest < Inferno::Test
-      include AUCoreTestKit::MustSupportTest
+      include InfernoSuiteGenerator::MustSupportTest
 
       title 'All must support elements are provided in the Immunization resources returned'
       description %(
@@ -30,7 +30,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/immunization/immunization_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 ImmunizationPatientChainSearchTest < Inferno::Test
-      include AUCoreTestKit::ChainedSearchTest
+      include InfernoSuiteGenerator::ChainedSearchTest
 
       title '(SHOULD) Server returns valid results for Immunization search by patient (chained parameters)'
       description %(A server SHOULD support searching by
 patient:Patient.identifier on the Immunization 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_immunization_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: 'Immunization',
           search_param_names: ['patient:Patient.identifier'],
           attr_paths: ['patient']
@@ -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/immunization/immunization_patient_date_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 ImmunizationPatientDateSearchTest < Inferno::Test
-      include AUCoreTestKit::SearchTest
+      include InfernoSuiteGenerator::SearchTest
 
       title '(SHOULD) Server returns valid results for Immunization search by patient + date'
       description %(
@@ -16,7 +16,7 @@ patient + date on the Immunization 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,8 +28,14 @@ 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: 'Immunization',
           search_param_names: %w[patient date],
           possible_status_search: true,
@@ -38,13 +44,17 @@ none are returned, the test is skipped.
       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[:immunization_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/immunization/immunization_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 ImmunizationPatient_DVA_ChainSearchTest < Inferno::Test
-      include AUCoreTestKit::ChainedSearchTest
+      include InfernoSuiteGenerator::ChainedSearchTest
 
       title '(SHOULD) Server returns valid results for Immunization search by patient (DVA) (chained parameters)'
       description %(A server SHOULD support searching by
 patient:Patient.identifier (DVA) on the Immunization 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_immunization_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: 'Immunization',
           search_param_names: ['patient:Patient.identifier'],
           attr_paths: ['patient'],
@@ -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/immunization/immunization_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 ImmunizationPatient_IHI_ChainSearchTest < Inferno::Test
-      include AUCoreTestKit::ChainedSearchTest
+      include InfernoSuiteGenerator::ChainedSearchTest
 
       title '(SHOULD) Server returns valid results for Immunization search by patient (IHI) (chained parameters)'
       description %(A server SHOULD support searching by
 patient:Patient.identifier (IHI) on the Immunization 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_immunization_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: 'Immunization',
           search_param_names: ['patient:Patient.identifier'],
           attr_paths: ['patient'],
@@ -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/immunization/immunization_patient_medicare_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 ImmunizationPatient_Medicare_ChainSearchTest < Inferno::Test
-      include AUCoreTestKit::ChainedSearchTest
+      include InfernoSuiteGenerator::ChainedSearchTest
 
       title '(SHOULD) Server returns valid results for Immunization search by patient (Medicare) (chained parameters)'
       description %(A server SHOULD support searching by
 patient:Patient.identifier (Medicare) on the Immunization 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_immunization_patient_medicare_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: 'Immunization',
           search_param_names: ['patient:Patient.identifier'],
           attr_paths: ['patient'],
@@ -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/immunization/immunization_patient_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 ImmunizationPatientSearchTest < Inferno::Test
-      include AUCoreTestKit::SearchTest
+      include InfernoSuiteGenerator::SearchTest
 
       title '(SHALL) Server returns valid results for Immunization search by patient'
       description %(
@@ -18,8 +18,7 @@ none are returned, the test is skipped.
 
 This test verifies that the server supports searching by reference using
 the form `patient=[id]` as well as `patient=Patient/[id]`. The two
-different forms are expected to return the same number of results. AU
-Core requires that both forms are supported by AU Core responders.
+different forms are expected to return the same number of results. AU Core requires that both forms are supported by AU Core responders.
 
 Because this is the first search of the sequence, resources in the
 response will be used for subsequent tests.
@@ -29,7 +28,7 @@ return the same number of results. Search by POST is required by the
 FHIR R4 specification, and these tests interpret search by GET as a
 requirement of AU Core v2.0.0.
 
-[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)
 
       )
 
@@ -39,8 +38,14 @@ requirement of AU Core v2.0.0.
             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(
           first_search: true,
           resource_type: 'Immunization',
           search_param_names: ['patient'],
@@ -51,13 +56,17 @@ requirement of AU Core v2.0.0.
       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[:immunization_resources] ||= {}
       end
 
+      def keep_all_search_results?
+        false
+      end
+
       run do
         run_search_test
       end