diff --git a/lib/onc_certification_g10_test_kit/onc_program_procedure.yml b/lib/onc_certification_g10_test_kit/onc_program_procedure.yml
index 17e43a62..3217bf4e 100644
--- a/lib/onc_certification_g10_test_kit/onc_program_procedure.yml
+++ b/lib/onc_certification_g10_test_kit/onc_program_procedure.yml
@@ -1627,6 +1627,7 @@ procedure:
           - 10.42.01
           - 10.43.01
           - 10.44.01
+          - 10.47.01
       - id: DAT-PAT-2
         SUT: |
           The health IT developer demonstrates the ability of the Health IT
diff --git a/lib/onc_certification_g10_test_kit/short_id_map.yml b/lib/onc_certification_g10_test_kit/short_id_map.yml
index 86bde493..55ffa896 100644
--- a/lib/onc_certification_g10_test_kit/short_id_map.yml
+++ b/lib/onc_certification_g10_test_kit/short_id_map.yml
@@ -1909,6 +1909,8 @@ g10_certification-g10_single_patient_us_core_6_api-us_core_v610_specimen-us_core
 g10_certification-g10_single_patient_us_core_6_api-us_core_v400_clinical_notes_guidance: '10.45'
 g10_certification-g10_single_patient_us_core_6_api-us_core_v400_clinical_notes_guidance-us_core_clinical_note_types: 10.45.01
 g10_certification-g10_single_patient_us_core_6_api-us_core_v400_clinical_notes_guidance-us_core_clinical_note_attachments: 10.45.02
+g10_certification-g10_single_patient_us_core_6_api-us_core_v610_screening_assessment: '10.47'
+g10_certification-g10_single_patient_us_core_6_api-us_core_v610_screening_assessment-us_core_screening_assessment_category: 10.47.01
 g10_certification-g10_single_patient_us_core_6_api-us_core_311_data_absent_reason: '10.46'
 g10_certification-g10_single_patient_us_core_6_api-us_core_311_data_absent_reason-us_core_311_data_absent_reason_extension: 10.46.01
 g10_certification-g10_single_patient_us_core_6_api-us_core_311_data_absent_reason-us_core_311_data_absent_reason_code_system: 10.46.02
diff --git a/lib/onc_certification_g10_test_kit/single_patient_us_core_6_api_group.rb b/lib/onc_certification_g10_test_kit/single_patient_us_core_6_api_group.rb
index ac3a3a61..50e384db 100644
--- a/lib/onc_certification_g10_test_kit/single_patient_us_core_6_api_group.rb
+++ b/lib/onc_certification_g10_test_kit/single_patient_us_core_6_api_group.rb
@@ -165,9 +165,6 @@ class SinglePatientUSCore6APIGroup < Inferno::TestGroup
 
       next if test_group.optional?
 
-      # TODO: Remove this line after ONC CCG release (FI-2804)
-      next if test_group.id.to_s.include? 'us_core_v610_screening_assessment'
-
       id = test_group.id
 
       group_config = {}