us_core_test_kit 0.7.0 → 0.7.2

data/lib/us_core_test_kit/generated/v6.1.0/granular_scope_tests/condition/condition_granular_scope_read_test.rb

@@ -0,0 +1,32 @@
+require_relative '../../../../generator/group_metadata'
+require_relative '../../../../granular_scope_read_test'
+
+module USCoreTestKit
+  module USCoreV610
+    class ConditionGranularScopeReadTest < Inferno::Test
+      include USCoreTestKit::GranularScopeReadTest
+
+      title 'Server filters results for Condition reads based on granular scopes'
+      description %(
+This test attempts Condition reads 
+and verifies that the results have been
+filtered based on the granted granular scopes.
+
+      )
+
+      id :us_core_v610_Condition_granular_scope_read_test
+
+      def resource_type
+        'Condition'
+      end
+
+      def self.metadata
+        @metadata ||= Generator::GroupMetadata.new(YAML.load_file(File.join(__dir__, 'metadata.yml'), aliases: true))
+      end
+
+      run do
+        run_scope_read_test
+      end
+    end
+  end
+end

data/lib/us_core_test_kit/generated/v6.1.0/granular_scope_tests/condition/{condition_patient_abatement_date_granular_scope_test.rb → condition_patient_abatement_date_granular_scope_search_test.rb}

@@ -1,12 +1,12 @@
 require_relative '../../../../search_test'
 require_relative '../../../../generator/group_metadata'
-require_relative '../../../../granular_scope_checker'
+require_relative '../../../../granular_scope_search_test'
 
 module USCoreTestKit
   module USCoreV610
-    class ConditionPatientAbatementDateGranularScopeTest < Inferno::Test
+    class ConditionPatientAbatementDateGranularScopeSearchTest < Inferno::Test
       include USCoreTestKit::SearchTest
-      include USCoreTestKit::GranularScopeChecker
+      include USCoreTestKit::GranularScopeSearchTest
 
       title 'Server filters results for Condition search by patient + abatement-date based on granular scopes'
       description %(
@@ -16,7 +16,7 @@ filtered based on the granted granular scopes.
 
       )
 
-      id :us_core_v610_Condition_patient_abatement_date_granular_scope_test
+      id :us_core_v610_Condition_patient_abatement_date_granular_scope_search_test
 
       input :patient_ids,
         title: 'Patient IDs',
@@ -34,7 +34,7 @@ filtered based on the granted granular scopes.
       end
 
       run do
-        run_scope_check_test
+        run_scope_search_test
       end
     end
   end

data/lib/us_core_test_kit/generated/v6.1.0/granular_scope_tests/condition/{condition_patient_asserted_date_granular_scope_test.rb → condition_patient_asserted_date_granular_scope_search_test.rb}

@@ -1,12 +1,12 @@
 require_relative '../../../../search_test'
 require_relative '../../../../generator/group_metadata'
-require_relative '../../../../granular_scope_checker'
+require_relative '../../../../granular_scope_search_test'
 
 module USCoreTestKit
   module USCoreV610
-    class ConditionPatientAssertedDateGranularScopeTest < Inferno::Test
+    class ConditionPatientAssertedDateGranularScopeSearchTest < Inferno::Test
       include USCoreTestKit::SearchTest
-      include USCoreTestKit::GranularScopeChecker
+      include USCoreTestKit::GranularScopeSearchTest
 
       title 'Server filters results for Condition search by patient + asserted-date based on granular scopes'
       description %(
@@ -16,7 +16,7 @@ filtered based on the granted granular scopes.
 
       )
 
-      id :us_core_v610_Condition_patient_asserted_date_granular_scope_test
+      id :us_core_v610_Condition_patient_asserted_date_granular_scope_search_test
 
       input :patient_ids,
         title: 'Patient IDs',
@@ -34,7 +34,7 @@ filtered based on the granted granular scopes.
       end
 
       run do
-        run_scope_check_test
+        run_scope_search_test
       end
     end
   end

data/lib/us_core_test_kit/generated/v6.1.0/granular_scope_tests/condition/{condition_patient_category_clinical_status_granular_scope_test.rb → condition_patient_category_clinical_status_granular_scope_search_test.rb}

@@ -1,12 +1,12 @@
 require_relative '../../../../search_test'
 require_relative '../../../../generator/group_metadata'
-require_relative '../../../../granular_scope_checker'
+require_relative '../../../../granular_scope_search_test'
 
 module USCoreTestKit
   module USCoreV610
-    class ConditionPatientCategoryClinicalStatusGranularScopeTest < Inferno::Test
+    class ConditionPatientCategoryClinicalStatusGranularScopeSearchTest < Inferno::Test
       include USCoreTestKit::SearchTest
-      include USCoreTestKit::GranularScopeChecker
+      include USCoreTestKit::GranularScopeSearchTest
 
       title 'Server filters results for Condition search by patient + category + clinical-status based on granular scopes'
       description %(
@@ -16,7 +16,7 @@ filtered based on the granted granular scopes.
 
       )
 
-      id :us_core_v610_Condition_patient_category_clinical_status_granular_scope_test
+      id :us_core_v610_Condition_patient_category_clinical_status_granular_scope_search_test
 
       input :patient_ids,
         title: 'Patient IDs',
@@ -34,7 +34,7 @@ filtered based on the granted granular scopes.
       end
 
       run do
-        run_scope_check_test
+        run_scope_search_test
       end
     end
   end

data/lib/us_core_test_kit/generated/v6.1.0/granular_scope_tests/condition/{condition_patient_category_encounter_granular_scope_test.rb → condition_patient_category_encounter_granular_scope_search_test.rb}

@@ -1,12 +1,12 @@
 require_relative '../../../../search_test'
 require_relative '../../../../generator/group_metadata'
-require_relative '../../../../granular_scope_checker'
+require_relative '../../../../granular_scope_search_test'
 
 module USCoreTestKit
   module USCoreV610
-    class ConditionPatientCategoryEncounterGranularScopeTest < Inferno::Test
+    class ConditionPatientCategoryEncounterGranularScopeSearchTest < Inferno::Test
       include USCoreTestKit::SearchTest
-      include USCoreTestKit::GranularScopeChecker
+      include USCoreTestKit::GranularScopeSearchTest
 
       title 'Server filters results for Condition search by patient + category + encounter based on granular scopes'
       description %(
@@ -16,7 +16,7 @@ filtered based on the granted granular scopes.
 
       )
 
-      id :us_core_v610_Condition_patient_category_encounter_granular_scope_test
+      id :us_core_v610_Condition_patient_category_encounter_granular_scope_search_test
 
       input :patient_ids,
         title: 'Patient IDs',
@@ -34,7 +34,7 @@ filtered based on the granted granular scopes.
       end
 
       run do
-        run_scope_check_test
+        run_scope_search_test
       end
     end
   end

data/lib/us_core_test_kit/generated/v6.1.0/granular_scope_tests/condition/{condition_patient_category_granular_scope_test.rb → condition_patient_category_granular_scope_search_test.rb}

@@ -1,12 +1,12 @@
 require_relative '../../../../search_test'
 require_relative '../../../../generator/group_metadata'
-require_relative '../../../../granular_scope_checker'
+require_relative '../../../../granular_scope_search_test'
 
 module USCoreTestKit
   module USCoreV610
-    class ConditionPatientCategoryGranularScopeTest < Inferno::Test
+    class ConditionPatientCategoryGranularScopeSearchTest < Inferno::Test
       include USCoreTestKit::SearchTest
-      include USCoreTestKit::GranularScopeChecker
+      include USCoreTestKit::GranularScopeSearchTest
 
       title 'Server filters results for Condition search by patient + category based on granular scopes'
       description %(
@@ -16,7 +16,7 @@ filtered based on the granted granular scopes.
 
       )
 
-      id :us_core_v610_Condition_patient_category_granular_scope_test
+      id :us_core_v610_Condition_patient_category_granular_scope_search_test
 
       input :patient_ids,
         title: 'Patient IDs',
@@ -34,7 +34,7 @@ filtered based on the granted granular scopes.
       end
 
       run do
-        run_scope_check_test
+        run_scope_search_test
       end
     end
   end

data/lib/us_core_test_kit/generated/v6.1.0/granular_scope_tests/condition/{condition_patient_clinical_status_granular_scope_test.rb → condition_patient_clinical_status_granular_scope_search_test.rb}

@@ -1,12 +1,12 @@
 require_relative '../../../../search_test'
 require_relative '../../../../generator/group_metadata'
-require_relative '../../../../granular_scope_checker'
+require_relative '../../../../granular_scope_search_test'
 
 module USCoreTestKit
   module USCoreV610
-    class ConditionPatientClinicalStatusGranularScopeTest < Inferno::Test
+    class ConditionPatientClinicalStatusGranularScopeSearchTest < Inferno::Test
       include USCoreTestKit::SearchTest
-      include USCoreTestKit::GranularScopeChecker
+      include USCoreTestKit::GranularScopeSearchTest
 
       title 'Server filters results for Condition search by patient + clinical-status based on granular scopes'
       description %(
@@ -16,7 +16,7 @@ filtered based on the granted granular scopes.
 
       )
 
-      id :us_core_v610_Condition_patient_clinical_status_granular_scope_test
+      id :us_core_v610_Condition_patient_clinical_status_granular_scope_search_test
 
       input :patient_ids,
         title: 'Patient IDs',
@@ -34,7 +34,7 @@ filtered based on the granted granular scopes.
       end
 
       run do
-        run_scope_check_test
+        run_scope_search_test
       end
     end
   end

data/lib/us_core_test_kit/generated/v6.1.0/granular_scope_tests/condition/{condition_patient_code_granular_scope_test.rb → condition_patient_code_granular_scope_search_test.rb}

@@ -1,12 +1,12 @@
 require_relative '../../../../search_test'
 require_relative '../../../../generator/group_metadata'
-require_relative '../../../../granular_scope_checker'
+require_relative '../../../../granular_scope_search_test'
 
 module USCoreTestKit
   module USCoreV610
-    class ConditionPatientCodeGranularScopeTest < Inferno::Test
+    class ConditionPatientCodeGranularScopeSearchTest < Inferno::Test
       include USCoreTestKit::SearchTest
-      include USCoreTestKit::GranularScopeChecker
+      include USCoreTestKit::GranularScopeSearchTest
 
       title 'Server filters results for Condition search by patient + code based on granular scopes'
       description %(
@@ -16,7 +16,7 @@ filtered based on the granted granular scopes.
 
       )
 
-      id :us_core_v610_Condition_patient_code_granular_scope_test
+      id :us_core_v610_Condition_patient_code_granular_scope_search_test
 
       input :patient_ids,
         title: 'Patient IDs',
@@ -34,7 +34,7 @@ filtered based on the granted granular scopes.
       end
 
       run do
-        run_scope_check_test
+        run_scope_search_test
       end
     end
   end

data/lib/us_core_test_kit/generated/v6.1.0/granular_scope_tests/condition/{condition_patient_granular_scope_test.rb → condition_patient_granular_scope_search_test.rb}

@@ -1,12 +1,12 @@
 require_relative '../../../../search_test'
 require_relative '../../../../generator/group_metadata'
-require_relative '../../../../granular_scope_checker'
+require_relative '../../../../granular_scope_search_test'
 
 module USCoreTestKit
   module USCoreV610
-    class ConditionPatientGranularScopeTest < Inferno::Test
+    class ConditionPatientGranularScopeSearchTest < Inferno::Test
       include USCoreTestKit::SearchTest
-      include USCoreTestKit::GranularScopeChecker
+      include USCoreTestKit::GranularScopeSearchTest
 
       title 'Server filters results for Condition search by patient based on granular scopes'
       description %(
@@ -16,7 +16,7 @@ filtered based on the granted granular scopes.
 
       )
 
-      id :us_core_v610_Condition_patient_granular_scope_test
+      id :us_core_v610_Condition_patient_granular_scope_search_test
 
       input :patient_ids,
         title: 'Patient IDs',
@@ -34,7 +34,7 @@ filtered based on the granted granular scopes.
       end
 
       run do
-        run_scope_check_test
+        run_scope_search_test
       end
     end
   end

data/lib/us_core_test_kit/generated/v6.1.0/granular_scope_tests/condition/{condition_patient_onset_date_granular_scope_test.rb → condition_patient_onset_date_granular_scope_search_test.rb}

@@ -1,12 +1,12 @@
 require_relative '../../../../search_test'
 require_relative '../../../../generator/group_metadata'
-require_relative '../../../../granular_scope_checker'
+require_relative '../../../../granular_scope_search_test'
 
 module USCoreTestKit
   module USCoreV610
-    class ConditionPatientOnsetDateGranularScopeTest < Inferno::Test
+    class ConditionPatientOnsetDateGranularScopeSearchTest < Inferno::Test
       include USCoreTestKit::SearchTest
-      include USCoreTestKit::GranularScopeChecker
+      include USCoreTestKit::GranularScopeSearchTest
 
       title 'Server filters results for Condition search by patient + onset-date based on granular scopes'
       description %(
@@ -16,7 +16,7 @@ filtered based on the granted granular scopes.
 
       )
 
-      id :us_core_v610_Condition_patient_onset_date_granular_scope_test
+      id :us_core_v610_Condition_patient_onset_date_granular_scope_search_test
 
       input :patient_ids,
         title: 'Patient IDs',
@@ -34,7 +34,7 @@ filtered based on the granted granular scopes.
       end
 
       run do
-        run_scope_check_test
+        run_scope_search_test
       end
     end
   end

data/lib/us_core_test_kit/generated/v6.1.0/granular_scope_tests/condition/{condition_patient_recorded_date_granular_scope_test.rb → condition_patient_recorded_date_granular_scope_search_test.rb}

@@ -1,12 +1,12 @@
 require_relative '../../../../search_test'
 require_relative '../../../../generator/group_metadata'
-require_relative '../../../../granular_scope_checker'
+require_relative '../../../../granular_scope_search_test'
 
 module USCoreTestKit
   module USCoreV610
-    class ConditionPatientRecordedDateGranularScopeTest < Inferno::Test
+    class ConditionPatientRecordedDateGranularScopeSearchTest < Inferno::Test
       include USCoreTestKit::SearchTest
-      include USCoreTestKit::GranularScopeChecker
+      include USCoreTestKit::GranularScopeSearchTest
 
       title 'Server filters results for Condition search by patient + recorded-date based on granular scopes'
       description %(
@@ -16,7 +16,7 @@ filtered based on the granted granular scopes.
 
       )
 
-      id :us_core_v610_Condition_patient_recorded_date_granular_scope_test
+      id :us_core_v610_Condition_patient_recorded_date_granular_scope_search_test
 
       input :patient_ids,
         title: 'Patient IDs',
@@ -34,7 +34,7 @@ filtered based on the granted granular scopes.
       end
 
       run do
-        run_scope_check_test
+        run_scope_search_test
       end
     end
   end

data/lib/us_core_test_kit/generated/v6.1.0/granular_scope_tests/condition/metadata.yml

@@ -350,26 +350,28 @@
 - :id: us_core_v610_condition_encounter_diagnosis_reference_resolution_test
   :file_name: condition_encounter_diagnosis_reference_resolution_test.rb
 :granular_scope_tests:
-- :id: us_core_v610_Condition_patient_category_granular_scope_test
-  :file_name: condition_patient_category_granular_scope_test.rb
-- :id: us_core_v610_Condition_patient_granular_scope_test
-  :file_name: condition_patient_granular_scope_test.rb
-- :id: us_core_v610_Condition_patient_recorded_date_granular_scope_test
-  :file_name: condition_patient_recorded_date_granular_scope_test.rb
-- :id: us_core_v610_Condition_patient_asserted_date_granular_scope_test
-  :file_name: condition_patient_asserted_date_granular_scope_test.rb
-- :id: us_core_v610_Condition_patient_category_clinical_status_granular_scope_test
-  :file_name: condition_patient_category_clinical_status_granular_scope_test.rb
-- :id: us_core_v610_Condition_patient_onset_date_granular_scope_test
-  :file_name: condition_patient_onset_date_granular_scope_test.rb
-- :id: us_core_v610_Condition_patient_abatement_date_granular_scope_test
-  :file_name: condition_patient_abatement_date_granular_scope_test.rb
-- :id: us_core_v610_Condition_patient_clinical_status_granular_scope_test
-  :file_name: condition_patient_clinical_status_granular_scope_test.rb
-- :id: us_core_v610_Condition_patient_category_encounter_granular_scope_test
-  :file_name: condition_patient_category_encounter_granular_scope_test.rb
-- :id: us_core_v610_Condition_patient_code_granular_scope_test
-  :file_name: condition_patient_code_granular_scope_test.rb
-:id: us_core_v610_condition_granular_scope_1_group
-:file_name: condition_granular_scope1_group.rb
+- :id: us_core_v610_Condition_patient_category_granular_scope_search_test
+  :file_name: condition_patient_category_granular_scope_search_test.rb
+- :id: us_core_v610_Condition_patient_granular_scope_search_test
+  :file_name: condition_patient_granular_scope_search_test.rb
+- :id: us_core_v610_Condition_patient_recorded_date_granular_scope_search_test
+  :file_name: condition_patient_recorded_date_granular_scope_search_test.rb
+- :id: us_core_v610_Condition_patient_asserted_date_granular_scope_search_test
+  :file_name: condition_patient_asserted_date_granular_scope_search_test.rb
+- :id: us_core_v610_Condition_patient_category_clinical_status_granular_scope_search_test
+  :file_name: condition_patient_category_clinical_status_granular_scope_search_test.rb
+- :id: us_core_v610_Condition_patient_onset_date_granular_scope_search_test
+  :file_name: condition_patient_onset_date_granular_scope_search_test.rb
+- :id: us_core_v610_Condition_patient_abatement_date_granular_scope_search_test
+  :file_name: condition_patient_abatement_date_granular_scope_search_test.rb
+- :id: us_core_v610_Condition_patient_clinical_status_granular_scope_search_test
+  :file_name: condition_patient_clinical_status_granular_scope_search_test.rb
+- :id: us_core_v610_Condition_patient_category_encounter_granular_scope_search_test
+  :file_name: condition_patient_category_encounter_granular_scope_search_test.rb
+- :id: us_core_v610_Condition_patient_code_granular_scope_search_test
+  :file_name: condition_patient_code_granular_scope_search_test.rb
+- :id: us_core_v610_Condition_granular_scope_read_test
+  :file_name: condition_granular_scope_read_test.rb
+:id: us_core_v610_condition_granular_scope_2_group
+:file_name: condition_granular_scope2_group.rb
 :delayed_references: []

data/lib/us_core_test_kit/generated/v6.1.0/granular_scope_tests/observation/metadata.yml

@@ -263,18 +263,20 @@
 - :id: us_core_v610_observation_lab_reference_resolution_test
   :file_name: observation_lab_reference_resolution_test.rb
 :granular_scope_tests:
-- :id: us_core_v610_Observation_patient_category_granular_scope_test
-  :file_name: observation_patient_category_granular_scope_test.rb
-- :id: us_core_v610_Observation_patient_code_date_granular_scope_test
-  :file_name: observation_patient_code_date_granular_scope_test.rb
-- :id: us_core_v610_Observation_patient_category_status_granular_scope_test
-  :file_name: observation_patient_category_status_granular_scope_test.rb
-- :id: us_core_v610_Observation_patient_category_date_granular_scope_test
-  :file_name: observation_patient_category_date_granular_scope_test.rb
-- :id: us_core_v610_Observation_patient_code_granular_scope_test
-  :file_name: observation_patient_code_granular_scope_test.rb
-:id: us_core_v610_observation_granular_scope_1_group
-:file_name: observation_granular_scope1_group.rb
+- :id: us_core_v610_Observation_patient_category_granular_scope_search_test
+  :file_name: observation_patient_category_granular_scope_search_test.rb
+- :id: us_core_v610_Observation_patient_code_date_granular_scope_search_test
+  :file_name: observation_patient_code_date_granular_scope_search_test.rb
+- :id: us_core_v610_Observation_patient_category_status_granular_scope_search_test
+  :file_name: observation_patient_category_status_granular_scope_search_test.rb
+- :id: us_core_v610_Observation_patient_category_date_granular_scope_search_test
+  :file_name: observation_patient_category_date_granular_scope_search_test.rb
+- :id: us_core_v610_Observation_patient_code_granular_scope_search_test
+  :file_name: observation_patient_code_granular_scope_search_test.rb
+- :id: us_core_v610_Observation_granular_scope_read_test
+  :file_name: observation_granular_scope_read_test.rb
+:id: us_core_v610_observation_granular_scope_2_group
+:file_name: observation_granular_scope2_group.rb
 :delayed_references:
 - :path: specimen
   :resources:

data/lib/us_core_test_kit/generated/v6.1.0/granular_scope_tests/observation/observation_granular_scope_read_test.rb

@@ -0,0 +1,32 @@
+require_relative '../../../../generator/group_metadata'
+require_relative '../../../../granular_scope_read_test'
+
+module USCoreTestKit
+  module USCoreV610
+    class ObservationGranularScopeReadTest < Inferno::Test
+      include USCoreTestKit::GranularScopeReadTest
+
+      title 'Server filters results for Observation reads based on granular scopes'
+      description %(
+This test attempts Observation reads 
+and verifies that the results have been
+filtered based on the granted granular scopes.
+
+      )
+
+      id :us_core_v610_Observation_granular_scope_read_test
+
+      def resource_type
+        'Observation'
+      end
+
+      def self.metadata
+        @metadata ||= Generator::GroupMetadata.new(YAML.load_file(File.join(__dir__, 'metadata.yml'), aliases: true))
+      end
+
+      run do
+        run_scope_read_test
+      end
+    end
+  end
+end

data/lib/us_core_test_kit/generated/v6.1.0/granular_scope_tests/observation/{observation_patient_category_date_granular_scope_test.rb → observation_patient_category_date_granular_scope_search_test.rb}

@@ -1,12 +1,12 @@
 require_relative '../../../../search_test'
 require_relative '../../../../generator/group_metadata'
-require_relative '../../../../granular_scope_checker'
+require_relative '../../../../granular_scope_search_test'
 
 module USCoreTestKit
   module USCoreV610
-    class ObservationPatientCategoryDateGranularScopeTest < Inferno::Test
+    class ObservationPatientCategoryDateGranularScopeSearchTest < Inferno::Test
       include USCoreTestKit::SearchTest
-      include USCoreTestKit::GranularScopeChecker
+      include USCoreTestKit::GranularScopeSearchTest
 
       title 'Server filters results for Observation search by patient + category + date based on granular scopes'
       description %(
@@ -16,7 +16,7 @@ filtered based on the granted granular scopes.
 
       )
 
-      id :us_core_v610_Observation_patient_category_date_granular_scope_test
+      id :us_core_v610_Observation_patient_category_date_granular_scope_search_test
 
       input :patient_ids,
         title: 'Patient IDs',
@@ -34,7 +34,7 @@ filtered based on the granted granular scopes.
       end
 
       run do
-        run_scope_check_test
+        run_scope_search_test
       end
     end
   end

data/lib/us_core_test_kit/generated/v6.1.0/granular_scope_tests/observation/{observation_patient_category_granular_scope_test.rb → observation_patient_category_granular_scope_search_test.rb}

@@ -1,12 +1,12 @@
 require_relative '../../../../search_test'
 require_relative '../../../../generator/group_metadata'
-require_relative '../../../../granular_scope_checker'
+require_relative '../../../../granular_scope_search_test'
 
 module USCoreTestKit
   module USCoreV610
-    class ObservationPatientCategoryGranularScopeTest < Inferno::Test
+    class ObservationPatientCategoryGranularScopeSearchTest < Inferno::Test
       include USCoreTestKit::SearchTest
-      include USCoreTestKit::GranularScopeChecker
+      include USCoreTestKit::GranularScopeSearchTest
 
       title 'Server filters results for Observation search by patient + category based on granular scopes'
       description %(
@@ -16,7 +16,7 @@ filtered based on the granted granular scopes.
 
       )
 
-      id :us_core_v610_Observation_patient_category_granular_scope_test
+      id :us_core_v610_Observation_patient_category_granular_scope_search_test
 
       input :patient_ids,
         title: 'Patient IDs',
@@ -34,7 +34,7 @@ filtered based on the granted granular scopes.
       end
 
       run do
-        run_scope_check_test
+        run_scope_search_test
       end
     end
   end

data/lib/us_core_test_kit/generated/v6.1.0/granular_scope_tests/observation/{observation_patient_category_status_granular_scope_test.rb → observation_patient_category_status_granular_scope_search_test.rb}

@@ -1,12 +1,12 @@
 require_relative '../../../../search_test'
 require_relative '../../../../generator/group_metadata'
-require_relative '../../../../granular_scope_checker'
+require_relative '../../../../granular_scope_search_test'
 
 module USCoreTestKit
   module USCoreV610
-    class ObservationPatientCategoryStatusGranularScopeTest < Inferno::Test
+    class ObservationPatientCategoryStatusGranularScopeSearchTest < Inferno::Test
       include USCoreTestKit::SearchTest
-      include USCoreTestKit::GranularScopeChecker
+      include USCoreTestKit::GranularScopeSearchTest
 
       title 'Server filters results for Observation search by patient + category + status based on granular scopes'
       description %(
@@ -16,7 +16,7 @@ filtered based on the granted granular scopes.
 
       )
 
-      id :us_core_v610_Observation_patient_category_status_granular_scope_test
+      id :us_core_v610_Observation_patient_category_status_granular_scope_search_test
 
       input :patient_ids,
         title: 'Patient IDs',
@@ -34,7 +34,7 @@ filtered based on the granted granular scopes.
       end
 
       run do
-        run_scope_check_test
+        run_scope_search_test
       end
     end
   end

data/lib/us_core_test_kit/generated/v6.1.0/granular_scope_tests/observation/{observation_patient_code_date_granular_scope_test.rb → observation_patient_code_date_granular_scope_search_test.rb}

@@ -1,12 +1,12 @@
 require_relative '../../../../search_test'
 require_relative '../../../../generator/group_metadata'
-require_relative '../../../../granular_scope_checker'
+require_relative '../../../../granular_scope_search_test'
 
 module USCoreTestKit
   module USCoreV610
-    class ObservationPatientCodeDateGranularScopeTest < Inferno::Test
+    class ObservationPatientCodeDateGranularScopeSearchTest < Inferno::Test
       include USCoreTestKit::SearchTest
-      include USCoreTestKit::GranularScopeChecker
+      include USCoreTestKit::GranularScopeSearchTest
 
       title 'Server filters results for Observation search by patient + code + date based on granular scopes'
       description %(
@@ -16,7 +16,7 @@ filtered based on the granted granular scopes.
 
       )
 
-      id :us_core_v610_Observation_patient_code_date_granular_scope_test
+      id :us_core_v610_Observation_patient_code_date_granular_scope_search_test
 
       input :patient_ids,
         title: 'Patient IDs',
@@ -34,7 +34,7 @@ filtered based on the granted granular scopes.
       end
 
       run do
-        run_scope_check_test
+        run_scope_search_test
       end
     end
   end