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 b5391245..20ca58c2 100644
--- a/lib/onc_certification_g10_test_kit/onc_program_procedure.yml
+++ b/lib/onc_certification_g10_test_kit/onc_program_procedure.yml
@@ -78,6 +78,7 @@ procedure:
           - 4.1.01
           - 5.1.01
           - 6.1.01
+          - 10.1.01
           - 7.1.01
           - 7.2.01
           - 7.3.01
@@ -513,7 +514,8 @@ procedure:
           adopted in § 170.213 and implementation specification adopted in
           § 170.215(a)(2).
 
-          If using US Core 3.1.1, 4.0.0, or 5.0.1, these resources include:
+          If using US Core 3.1.1, 4.0.0, 5.0.1, or 6.1.0 these resources include:
+
           * “AllergyIntolerance”;
           * “CarePlan”;
           * “CareTeam”;
@@ -530,11 +532,18 @@ procedure:
           * “Procedure”; and
           * “Provenance”.
 
-          Additionally, the following resources must be supported if using US
-          Core 5.0.1:
+          The following resources must also be supported if using US Core 5.0.1:
           * “Encounter”;
           * “RelatedPerson”; and
           * “ServiceRequest”
+
+          The following resources must also be supported if using US Core 6.1.0:
+          * "Encounter"
+          * "Coverage"
+          * "Specimen"
+          * "MedicationDispense"
+          * "RelatedPerson"; and
+          * "ServiceRequest"
         TLV: |
           [Both] The tester verifies the ability of the Health IT Module to
           evaluate the authorization request and request end-user input, if
@@ -544,7 +553,8 @@ procedure:
           associated with the profiles specified in the standard adopted in
           § 170.213 and implementation specification adopted in § 170.215(a)(2).
 
-          If using US Core 3.1.1, 4.0.0, or 5.0.1, these resources include:
+          If using US Core 3.1.1, 4.0.0, 5.0.1, or 6.1.0 these resources include:
+
           * “AllergyIntolerance”;
           * “CarePlan”;
           * “CareTeam”;
@@ -561,11 +571,19 @@ procedure:
           * “Procedure”; and
           * “Provenance”.
 
-          Additionally, the following resources must be supported if using US
-          Core 5.0.1:
+          The following resources must also be supported if using US Core 5.0.1:
           * “Encounter”;
           * “RelatedPerson”; and
           * “ServiceRequest”
+
+          The following resources must also be supported if using US Core 6.1.0:
+          * "Encounter"
+          * "Coverage"
+          * "Specimen"
+          * "MedicationDispense"
+          * "RelatedPerson"; and
+          * "ServiceRequest"
+
         inferno_supported: 'yes'
         inferno_tests:
           - 1.3.02
@@ -580,8 +598,8 @@ procedure:
           - 2.1.05
           - 2.2.02
           - 2.2.05
-          - 1.7.01 - 1.7.16
-          - 2.3.01 - 2.3.15
+          - 1.7.01 - 1.7.20
+          - 2.3.01 - 2.3.19
         inferno_notes: |
           Inferno verifies that end-user input is requested by requiring one app
           launch have complete access to required resources and having one app
@@ -611,8 +629,8 @@ procedure:
           - 2.1.05
           - 2.2.02
           - 2.2.05
-          - 1.7.01 - 1.7.16
-          - 2.3.01 - 2.3.15
+          - 1.7.01 - 1.7.20
+          - 2.3.01 - 2.3.19
         inferno_notes: |
           Inferno verifies that end-user input is requested by requiring one app
           launch have complete access to required resources and having one app
@@ -643,8 +661,8 @@ procedure:
           - 2.1.05
           - 2.2.02
           - 2.2.05
-          - 1.7.01 - 1.7.16
-          - 2.3.01 - 2.3.15
+          - 1.7.01 - 1.7.20
+          - 2.3.01 - 2.3.19
         inferno_notes: |
           Inferno verifies that end-user input is requested by requiring one app
           launch have complete access to required resources and having one app
@@ -901,17 +919,17 @@ procedure:
           - 9.9.10
       - id: AUT-PAT-32
         SUT: |
-          [EHR-Launch] The following must be supported if using US Core 5.0.1:
-          The health IT developer demonstrates the ability of the Health IT
-          Module to return an “Encounter” FHIR® resource that matches the
+          [EHR-Launch] The following must be supported if using US Core 5.0.1 or
+          6.1.0: The health IT developer demonstrates the ability of the Health
+          IT Module to return an “Encounter” FHIR® resource that matches the
           encounter context provided in step AUT-PAT-9 of this section according
           to the implementation specification adopted in § 170.215(a)(2).
         TLV: |
-          [EHR-Launch] The following must be supported if using US Core 5.0.1:
-          The tester verifies the ability of the Health IT Module to return an
-          “Encounter” FHIR® resource that matches the encounter context provided
-          in step AUT-PAT-9 of this section according to the implementation
-          specification adopted in § 170.215(a)(2).
+          [EHR-Launch] The following must be supported if using US Core 5.0.1 or
+          6.1.0: The tester verifies the ability of the Health IT Module to
+          return an “Encounter” FHIR® resource that matches the encounter
+          context provided in step AUT-PAT-9 of this section according to the
+          implementation specification adopted in § 170.215(a)(2).
         inferno_supported: 'yes'
         inferno_tests:
           - 3.3.13
@@ -1220,6 +1238,7 @@ procedure:
           - 4.1.02 - 4.1.05
           - 5.1.02 - 5.1.06
           - 6.1.02 - 6.1.06
+          - 10.1.02 - 10.1.06
       - id: SH-PAT-2
         SUT: |
           The health IT developer demonstrates the ability of the Health IT
@@ -1326,6 +1345,42 @@ procedure:
           - 6.34.01
           - 6.35.01
           - 6.36.01
+          - 10.2.01
+          - 10.3.01
+          - 10.4.01
+          - 10.5.01
+          - 10.6.01
+          - 10.7.01
+          - 10.8.01
+          - 10.9.01
+          - 10.10.01
+          - 10.11.01
+          - 10.12.01
+          - 10.13.01
+          - 10.14.01
+          - 10.15.01
+          - 10.16.01
+          - 10.17.01
+          - 10.18.01
+          - 10.19.01
+          - 10.20.01
+          - 10.21.01
+          - 10.22.01
+          - 10.23.01
+          - 10.24.01
+          - 10.25.01
+          - 10.26.01
+          - 10.27.01
+          - 10.28.01
+          - 10.29.01
+          - 10.30.01
+          - 10.31.01
+          - 10.32.01
+          - 10.33.01
+          - 10.34.01
+          - 10.35.01
+          - 10.36.01
+          - 10.37.01
       - id: SH-PAT-3
         SUT: |
           The health IT developer demonstrates the ability of the Health IT
@@ -1432,6 +1487,42 @@ procedure:
           - 6.34.05
           - 6.35.04
           - 6.36.07
+          - 10.2.01
+          - 10.3.01
+          - 10.4.01
+          - 10.5.01
+          - 10.6.01
+          - 10.7.01
+          - 10.8.01
+          - 10.9.01
+          - 10.10.01
+          - 10.11.01
+          - 10.12.01
+          - 10.13.01
+          - 10.14.01
+          - 10.15.01
+          - 10.16.01
+          - 10.17.01
+          - 10.18.01
+          - 10.19.01
+          - 10.20.01
+          - 10.21.01
+          - 10.22.01
+          - 10.23.01
+          - 10.24.01
+          - 10.25.01
+          - 10.26.01
+          - 10.27.01
+          - 10.28.01
+          - 10.29.01
+          - 10.30.01
+          - 10.31.01
+          - 10.32.01
+          - 10.33.01
+          - 10.34.01
+          - 10.35.01
+          - 10.36.01
+          - 10.37.01
       - group: Supported Search Operations for Multiple Patients’ Data
         id: SH-PAT-4
         SUT: |
@@ -1588,6 +1679,49 @@ procedure:
           - 7.3.06 - 7.3.27
           - 8.3.03
           - 8.3.06 - 8.3.27
+          - 10.2.06
+          - 10.3.02
+          - 10.4.02
+          - 10.5.02
+          - 10.6.03
+          - 10.7.03
+          - 10.8.02
+          - 10.9.02
+          - 10.10.05
+          - 10.11.05
+          - 10.12.06
+          - 10.13.04
+          - 10.14.02
+          - 10.15.02
+          - 10.16.02
+          - 10.17.03
+          - 10.18.04
+          - 10.19.04
+          - 10.20.04
+          - 10.21.04
+          - 10.22.04
+          - 10.23.04
+          - 10.24.04
+          - 10.25.04
+          - 10.26.04
+          - 10.27.04
+          - 10.28.02
+          - 10.29.04
+          - 10.30.04
+          - 10.31.04
+          - 10.32.04
+          - 10.33.04
+          - 10.34.04
+          - 10.35.04
+          - 10.36.04
+          - 10.37.04
+          - 10.38.03
+          - 10.39.06
+          - 10.40.01
+          - 10.41.01
+          - 10.42.01
+          - 10.43.01
+          - 10.44.01
       - id: DAT-PAT-2
         SUT: |
           The health IT developer demonstrates the ability of the Health IT
@@ -1718,6 +1852,49 @@ procedure:
           - 6.38.02 - 6.38.03
           - 6.39.02 - 6.39.03
           - 6.40.02 - 6.40.03
+          - 10.2.08 - 10.2.09
+          - 10.3.04 - 10.3.05
+          - 10.4.04 - 10.4.05
+          - 10.5.04 - 10.5.05
+          - 10.6.05 - 10.6.06
+          - 10.7.05 - 10.7.06
+          - 10.8.04 - 10.8.05
+          - 10.9.04 - 10.9.05
+          - 10.10.07 - 10.10.08
+          - 10.11.07 - 10.11.08
+          - 10.12.08 - 10.12.09
+          - 10.13.06 - 10.13.07
+          - 10.14.04 - 10.14.05
+          - 10.15.04 - 10.15.05
+          - 10.16.04 - 10.16.05
+          - 10.17.06 - 10.17.07
+          - 10.18.06 - 10.18.07
+          - 10.19.06 - 10.19.07
+          - 10.20.06 - 10.20.07
+          - 10.21.06 - 10.21.07
+          - 10.22.06 - 10.22.07
+          - 10.23.06 - 10.23.07
+          - 10.24.06 - 10.24.07
+          - 10.25.06 - 10.25.07
+          - 10.26.06 - 10.26.07
+          - 10.27.06 - 10.27.07
+          - 10.28.04 - 10.28.05
+          - 10.29.06 - 10.29.07
+          - 10.30.06 - 10.30.07
+          - 10.31.06 - 10.31.07
+          - 10.32.06 - 10.32.07
+          - 10.33.06 - 10.33.07
+          - 10.34.06 - 10.34.07
+          - 10.35.06 - 10.35.07
+          - 10.36.06 - 10.36.07
+          - 10.37.06 - 10.37.07
+          - 10.38.05 - 10.38.06
+          - 10.39.08 - 10.39.09
+          - 10.40.02 - 10.40.03
+          - 10.41.02 - 10.41.03
+          - 10.42.02 - 10.42.03
+          - 10.43.02 - 10.43.03
+          - 10.44.03 - 10.44.04
           - 7.3.03
           - 7.3.06 - 7.3.27
           - 8.3.03
@@ -1840,6 +2017,45 @@ procedure:
           - 6.35.04
           - 6.36.07
           - 6.39.01 - 6.39.04
+          - 10.2.07
+          - 10.3.03
+          - 10.4.03
+          - 10.5.03
+          - 10.6.04
+          - 10.7.04
+          - 10.8.03
+          - 10.9.03
+          - 10.10.06
+          - 10.11.06
+          - 10.12.07
+          - 10.13.05
+          - 10.14.03
+          - 10.15.03
+          - 10.16.03
+          - 10.17.04
+          - 10.18.05
+          - 10.19.05
+          - 10.20.05
+          - 10.21.05
+          - 10.22.05
+          - 10.23.05
+          - 10.24.05
+          - 10.25.05
+          - 10.26.05
+          - 10.27.05
+          - 10.28.03
+          - 10.29.05
+          - 10.30.05
+          - 10.31.05
+          - 10.32.05
+          - 10.33.05
+          - 10.34.05
+          - 10.35.05
+          - 10.36.05
+          - 10.37.05
+          - 10.38.04
+          - 10.39.07
+          - 10.42.01 - 10.42.04
           - 7.3.21
           - 8.3.21
       - id: DAT-PAT-4
@@ -1861,6 +2077,7 @@ procedure:
           - 4.31.01 - 4.31.02
           - 5.33.01 - 5.33.02
           - 6.41.01 - 6.41.02
+          - 10.45.01 - 10.45.02
       - id: DAT-PAT-5
         SUT: |
           If supported, and for responses to data for a single patient only, the
@@ -1879,6 +2096,7 @@ procedure:
           - 4.13.06
           - 5.13.06
           - 6.15.06
+          - 10.17.06
       - id: DAT-PAT-6
         SUT: |
           The health IT developer demonstrates the ability of the Health IT
@@ -1899,6 +2117,7 @@ procedure:
           - 4.32.01 - 4.32.02
           - 5.34.01 - 5.34.02
           - 6.42.01 - 6.42.02
+          - 10.46.01 - 10.46.02
       - group: Response to Requests for a Single Patient’s Data
         id: DAT-PAT-7
         SUT: |
@@ -2002,6 +2221,49 @@ procedure:
           - 6.34.01
           - 6.35.01
           - 6.36.01
+          - 10.2.01
+          - 10.3.01
+          - 10.4.01
+          - 10.5.01
+          - 10.6.01
+          - 10.7.01
+          - 10.8.01
+          - 10.9.01
+          - 10.10.01
+          - 10.11.01
+          - 10.12.01
+          - 10.13.01
+          - 10.14.01
+          - 10.15.01
+          - 10.16.01
+          - 10.17.01
+          - 10.18.01
+          - 10.19.01
+          - 10.20.01
+          - 10.21.01
+          - 10.22.01
+          - 10.23.01
+          - 10.24.01
+          - 10.25.01
+          - 10.26.01
+          - 10.27.01
+          - 10.28.01
+          - 10.29.01
+          - 10.30.01
+          - 10.31.01
+          - 10.32.01
+          - 10.33.01
+          - 10.34.01
+          - 10.35.01
+          - 10.36.01
+          - 10.37.01
+          - 10.38.01
+          - 10.39.01
+          - 10.40.01
+          - 10.41.01
+          - 10.42.01
+          - 10.43.01
+          - 10.44.01
       - group: Response to Requests for Multiple Patients’ Data
         id: DAT-PAT-8
         SUT: |
@@ -2129,6 +2391,80 @@ procedure:
           - 7.3.06 - 7.3.27
           - 8.3.03
           - 8.3.06 - 8.3.27
+      - id: DAT-PAT-17
+        SUT: |
+          The health IT developer demonstrates the ability of the Health IT
+          Module to respond to requests for multiple patients’ data according to
+          the implementation specification adopted in § 170.215(a)(4) for all of
+          the FHIR® resources associated with the profiles and Data Elements
+          specified in and according to the standard adopted in § 170.213 and
+          implementation specification adopted in § 170.215(a)(2).
+
+          * “AllergyIntolerance”;
+          * “CarePlan”;
+          * “CareTeam”;
+          * “Condition”;
+          * “Coverage”
+          * “Device”;
+          * “DiagnosticReport”;
+          * “DocumentReference”;
+          * “Encounter”;
+          * “Goal”;
+          * “Immunization”;
+          * “Location” (if supported);
+          * “Medication” (if supported);
+          * “MedicationDispense”
+          * “MedicationRequest”;
+          * “Observation”;
+          * “Organization”;
+          * “Patient”;
+          * “Practitioner”
+          * “Procedure”;
+          * “Provenance”;
+          * “PractitionerRole” (if supported);
+          * “QuestionnaireReponse” (if supported);
+          * “RelatedPerson”;
+          * “Specimen”; and
+          * “ServiceRequest”
+        TLV: |
+          The health IT developer verifies the ability of the Health IT Module
+          to respond to requests for multiple patients’ data according to the
+          implementation specification adopted in § 170.215(a)(4) for all of the
+          FHIR® resources associated with the profiles and Data Elements
+          specified in and according to the standard adopted in § 170.213 and
+          implementation specification adopted in § 170.215(a)(2).
+          * “AllergyIntolerance”;
+          * “CarePlan”;
+          * “CareTeam”;
+          * “Condition”;
+          * “Coverage”
+          * “Device”;
+          * “DiagnosticReport”;
+          * “DocumentReference”;
+          * “Encounter”;
+          * “Goal”;
+          * “Immunization”;
+          * “Location” (if supported);
+          * “Medication” (if supported);
+          * “MedicationDispense”
+          * “MedicationRequest”;
+          * “Observation”;
+          * “Organization”;
+          * “Patient”;
+          * “Practitioner”
+          * “Procedure”;
+          * “Provenance”;
+          * “PractitionerRole” (if supported);
+          * “QuestionnaireReponse” (if supported);
+          * “RelatedPerson”;
+          * “Specimen”; and
+          * “ServiceRequest”
+        inferno_supported: 'yes'
+        inferno_tests:
+          - 7.3.03
+          - 7.3.06 - 7.3.34
+          - 8.3.03
+          - 8.3.06 - 8.3.34
       - id: DAT-PAT-9
         SUT: |
           The health IT developer demonstrates the ability of the Health IT
diff --git a/onc_certification_g10_matrix.xlsx b/onc_certification_g10_matrix.xlsx
index 97b0b6e5..f0c04113 100644
Binary files a/onc_certification_g10_matrix.xlsx and b/onc_certification_g10_matrix.xlsx differ