us_core_test_kit 0.11.3 → 0.11.4

data/lib/us_core_test_kit/client/generated/v5.0.1/smokingstatus_client_group.rb

@@ -3,45 +3,62 @@
 require_relative 'smokingstatus/smokingstatus_client_read_test'
 require_relative 'smokingstatus/smokingstatus_patient_code_client_search_test'
 require_relative 'smokingstatus/smokingstatus_patient_category_date_client_search_test'
+require_relative 'smokingstatus/smokingstatus_patient_code_date_client_search_test'
 require_relative 'smokingstatus/smokingstatus_patient_category_client_search_test'
+require_relative 'smokingstatus/smokingstatus_patient_category_status_client_search_test'
 
 module USCoreTestKit
   module Client
     module USCoreClientV501
       class SmokingstatusClientGroup < Inferno::TestGroup
         id :us_core_client_v501_smokingstatus
-
         title 'Observation Smoking Status'
-
         description %(
           
 # Background
 
-This test group verifies that the client under test is
-able to perform the required Observation queries.
+This test group verifies that the client can access Observation data
+conforming to the US Core Smoking Status Observation Profile.
 
 # Testing Methodology
 
+## Data Access Supported
+
+Clients may not be required to support the Observation FHIR resource type. However, if they
+do support it, they must support the US Core Smoking Status Observation Profile and the resource type's search parameters.
+The tests in this group will not execute if client makes no attempt to access data for the
+Observation resource type. In this case, the test will be marked as skip if support
+for the resource type is required, and omitted otherwise.
+
 ## Reading
-This sequence will check that the client performed a search with the following ID:
+This test will check that the client performed a read of the following id:
 
 * `us-core-client-tests-smokingstatus`
 
 ## Searching
-This sequence will check that the client performed searches with the following parameters:
+These tests will check that the client performed searches agains the
+Observation resource type with the following required parameters:
 
 * patient + code
 * patient + category + date
 * patient + category
 
-        )
+Inferno will also look for searches using the following optional parameters:
+
+* patient + code + date
+* patient + category + status
 
+
+        )
+        optional true
         run_as_group
 
         test from: :us_core_v501_smokingstatus_client_read_test
         test from: :us_core_v501_smokingstatus_patient_code_client_search_test
         test from: :us_core_v501_smokingstatus_patient_category_date_client_search_test
+        test from: :us_core_v501_smokingstatus_patient_code_date_client_search_test
         test from: :us_core_v501_smokingstatus_patient_category_client_search_test
+        test from: :us_core_v501_smokingstatus_patient_category_status_client_search_test
       end
     end
   end

data/lib/us_core_test_kit/client/generated/v5.0.1/urls.rb

@@ -25,7 +25,7 @@ module USCoreTestKit
           base_url + FHIR_ROUTE
         end
 
-        def client_fhir_base_url # alias for OIDC from SMART / UDAP client tests
+        def client_fhir_base_url # alias for OIDC from SMART client tests
           fhir_url
         end
 

data/lib/us_core_test_kit/client/generated/v5.0.1/us_core_client_test_suite.rb

@@ -1,13 +1,10 @@
 # frozen_string_literal: true
 
-require 'udap_security_test_kit'
 require 'smart_app_launch_test_kit'
 require_relative '../../../version'
 require_relative 'tags'
 require_relative 'urls'
 require_relative '../../metadata_helper'
-require_relative 'authorization_endpoint'
-require_relative 'token_endpoint'
 require_relative 'read_endpoint'
 require_relative 'search_endpoint'
 require_relative '../../test_helper'
@@ -17,7 +14,6 @@ require_relative 'wait_group'
 require_relative 'auth_smart_alca_group'
 require_relative 'auth_smart_alcs_group'
 require_relative 'auth_smart_alp_group'
-require_relative 'auth_udap_group'
 require_relative 'patient_client_group'
 require_relative 'allergy_intolerance_client_group'
 require_relative 'care_plan_client_group'
@@ -67,13 +63,11 @@ module USCoreTestKit
         include URLs
 
         id :us_core_client_v501
-
         title 'US Core Client v5.0.1'
-
         description %(
           
 The US Core Test Kit Client Suite tests client systems for their conformance
-to the US Core Implementation Guide.
+to the [US Core Implementation Guide](http://hl7.org/fhir/us/core/STU5.0.1).
 
 # Scope
 
@@ -84,123 +78,63 @@ requirements and may change the test verification logic.
 
 # Test Methodology
 
-For these tests Inferno simulates the FHIR server. Inferno's simulated server contains
-data for each of the following US Core Profiles:
-
-* **Patient**
-  * id: us-core-client-tests-patient
-* **AllergyIntolerance**
-  * id: us-core-client-tests-allergy-intolerance
-* **CarePlan**
-  * id: us-core-client-tests-care-plan
-* **CareTeam**
-  * id: us-core-client-tests-care-team
-* **ConditionEncounterDiagnosis**
-  * id: us-core-client-tests-condition-encounter-diagnosis
-* **ConditionProblemsHealthConcerns**
-  * id: us-core-client-tests-condition-problems-health-concerns
-* **Device**
-  * id: us-core-client-tests-device
-* **DiagnosticReportNote**
-  * id: us-core-client-tests-diagnostic-report-note
-* **DiagnosticReportLab**
-  * id: us-core-client-tests-diagnostic-report-lab
-* **DocumentReference**
-  * id: us-core-client-tests-document-reference
-* **Encounter**
-  * id: us-core-client-tests-encounter
-* **Goal**
-  * id: us-core-client-tests-goal
-* **Immunization**
-  * id: us-core-client-tests-immunization
-* **MedicationRequest**
-  * id: us-core-client-tests-medication-request
-* **ObservationLab**
-  * id: us-core-client-tests-observation-lab
-* **ObservationSdohAssessment**
-  * id: us-core-client-tests-observation-sdoh-assessment
-* **RespiratoryRate**
-  * id: us-core-client-tests-respiratory-rate
-* **ObservationSocialHistory**
-  * id: us-core-client-tests-observation-social-history
-* **HeartRate**
-  * id: us-core-client-tests-heart-rate
-* **BodyTemperature**
-  * id: us-core-client-tests-body-temperature
-* **PediatricWeightForHeight**
-  * id: us-core-client-tests-pediatric-weight-for-height
-* **PulseOximetry**
-  * id: us-core-client-tests-pulse-oximetry
-* **Smokingstatus**
-  * id: us-core-client-tests-smokingstatus
-* **ObservationSexualOrientation**
-  * id: us-core-client-tests-observation-sexual-orientation
-* **HeadCircumference**
-  * id: us-core-client-tests-head-circumference
-* **BodyHeight**
-  * id: us-core-client-tests-body-height
-* **Bmi**
-  * id: us-core-client-tests-bmi
-* **BloodPressure**
-  * id: us-core-client-tests-blood-pressure
-* **ObservationImaging**
-  * id: us-core-client-tests-observation-imaging
-* **ObservationClinicalTest**
-  * id: us-core-client-tests-observation-clinical-test
-* **PediatricBmiForAge**
-  * id: us-core-client-tests-pediatric-bmi-for-age
-* **HeadCircumferencePercentile**
-  * id: us-core-client-tests-head-circumference-percentile
-* **BodyWeight**
-  * id: us-core-client-tests-body-weight
-* **Procedure**
-  * id: us-core-client-tests-procedure
-* **QuestionnaireResponse**
-  * id: us-core-client-tests-questionnaire-response
-* **ServiceRequest**
-  * id: us-core-client-tests-service-request
-* **Organization**
-  * id: us-core-client-tests-organization
-* **Practitioner**
-  * id: us-core-client-tests-practitioner
-* **PractitionerRole**
-  * id: us-core-client-tests-practitioner-role
-* **Provenance**
-  * id: us-core-client-tests-provenance
-* **RelatedPerson**
-  * id: us-core-client-tests-related-person
-
+For these tests Inferno simulates the FHIR server containing data for each US Core Profile
+(see the *Available Instances* section below for details on the data served by Inferno).
 During execution, Inferno will wait for the client under test to issue requests and will
 respond to them with the requested data. Inferno will then evaluate the requests in aggregate
 to verify that they demonstrate that the client:
 
-* Retrieved instances of each profile
+* Retrieved a target instance for each profile.
 * Performed searches using the required search parameters and search parameter combinations
+  for the profile's resource type.
+
+# Interpreting the Results
+ 
+These tests will check for support for requesting data for every US Core profile.
+The "Read & Search" group includes a sub-group for each US Core profile. Groups
+for profiles of resources that are required by the US Core Client CapabilityStatement
+are marked as required while groups for others are optional. Each profile group will be
+evaluated on every run through these tests, but feedback will only be provided on
+profiles of resource types that the client makes requests for.
+- If a client makes a request for a given resource type, support for all profiles of that
+  resource type will be evaluated, meaning that the group for each profile of that resource
+  type will be executed, checking that the client read the target instance for that profile
+  and perform searches with all required search parameters and combinations for the resource
+  type. The executed group will pass or fail and include details of the issues encountered by
+  Inferno.
+- If a client makes no requests for a given resource type, support is not evaluated. If support
+  for the resource type is required, the tests will be marked as skiped, forcing an overall
+  failure. Otherwise, the tests will be marked as omitted on the assumption that the client
+  does not support the optional resource type and profile represented by the group.
+
+The tests will not pass unless at least one profile group passes.
 
 # Running the Tests
 
 ## Quick Start
 
 Inferno's simulated US Core endpoints require authentication using the OAuth flows
-conforming to one of the following:
-- SMART [App Launch flow](https://hl7.org/fhir/smart-app-launch/STU2.2/app-launch.html), or
-- UDAP [Consumer-Facing flow](https://hl7.org/fhir/us/udap-security/STU1/consumer.html).
+conforming the SMART [App Launch flow](https://hl7.org/fhir/smart-app-launch/STU2.2/app-launch.html).
 
 When creating a test session, select the Client Security Type corresponding to an
 authentication approach supported by the client. Then, start by running the "Client Registration"
 group which will guide you through the registration process, including what inputs to provide.
 See the *Auth Configuration Details* section below for details.
 
-Once registration is complete, run the "Read & Search" group to have Inferno wait for US Core
-read and search requests from the client, return the requested US Core
-resources to the client, and verify the interactions. The Patient that the client
+Once registration is complete, run the "Read & Search" group to activate Inferno's
+simulated US Core server, allowing it to wait for US Core read and search requests
+from the client and return the requested US Core resources. The Patient that the client
 needs to request data for has the following demographic details:
-- **Resource ID**: us-core-client-tests-patient
+- **Resource ID**: `us-core-client-tests-patient`
 - **Name**: ClientTests USCore
-- **Member Identifier**: us-core-client-tests-patient (system: Inferno)
+- **Member Identifier**: `us-core-client-tests-patient` (system: `urn:inferno:mrn`)
 - **Date of Birth**: 1940-03-29
 - **Gender**: male
 
+While waiting, Inferno will display a "User Action Needed" dialog with the above details and
+more. Once the client has made all the requests, click the link in that dialog to have
+Inferno evaluate the requests made.
+
 ## Demonstration
 
 To try out these tests without an actual US Core client implementation, you may run them against
@@ -222,40 +156,32 @@ the US Core Server tests using the following steps:
    may fail.
 4. Select the "US Core FHIR API" group from the list at the left, click the "RUN ALL TESTS" button
    in the upper right, and then click "SUBMIT" at the bottom of the input dialog that appears.
-   These tests will run for a while and may result in test failures around must support and
-   conformance features.
+   These tests will run for a while. Most groups will skip due to incomplete coverage of must support
+   elements in the client test's data set.
 5. Once the server tests have completed, return to the client test session and click the link
    in the "User Action Required" dialog to continue the tests and evaluate the client's
-   interactions. These tests will also run for a while and may result in some failures.
+   interactions. These tests will also run for a while and may result in some failures or skips.
 
 # Input Details
 
 ## Auth Configuration Details
 
-When running these tests there are 4 options for authentication, which also allows
+When running these tests there are 3 options for SMART authentication, which also allows
 Inferno to identify which session the requests are for. The choice is made when the
 session is created with the selected Client Security Type option, which determines
-what details the tester needs to provide during the Client Registration tests:
-
-- **SMART App Launch Client**: the system under test will manually register
-  with Inferno and request access tokens to use when accessing FHIR endpoints
-  as per the SMART App Luanch specification, which includes providing one or more
-  redirect URI(s) in the **SMART App Launch Redirect URI(s)** input, and optionally,
-  launch URL(s) in the **SMART App Launch URL(s)** input. Additionally, testers may provide
-  a **Client Id** if they want their client assigned a specific one. Depending on the
-  specific SMART flavor chosen, additional inputs for authentication may be needed:
-  - **SMART App Launch Public Client**: no additional authentication inputs
-  - **SMART App Launch Confidential Symmetric Client**: provide a secret using the
-    **SMART Confidential Symmetric Client Secret** input.
-  - **SMART App Launch Confidential Asymmetric Client**: provide a URL that resolves
-    to a JWKS or a raw JWKS in JSON format using the **SMART JSON Web Key Set (JWKS)** input.
-- **UDAP Authorization Code Client**: the system under test will dynamically register
-  with Inferno and request access tokens used to access FHIR endpoints
-  as per the UDAP specification. It requires the **UDAP Client URI** input
-  to be populated with the URI that the client will use when dynamically
-  registering with Inferno. This will be used to generate a client id (each
-  unique UDAP Client URI will always get the same client id). All other details
-  that Inferno needs will be provided as a part of the dynamic registration.
+what details the tester needs to provide during manual SMART registration with Inferno.
+
+In all cases, testers will provide:
+- One or more redirect URI(s) in the **SMART App Launch Redirect URI(s)** input.
+- Zero or more launch URL(s) in the **SMART App Launch URL(s)** input.
+- Optionally, a **Client Id** if they want their client assigned a specific id. 
+  
+Depending on the specific SMART flavor chosen, additional inputs for authentication may be needed:
+- **SMART App Launch Public Client**: no additional authentication inputs
+- **SMART App Launch Confidential Symmetric Client**: provide a secret using the
+  **SMART Confidential Symmetric Client Secret** input.
+- **SMART App Launch Confidential Asymmetric Client**: provide a URL that resolves
+  to a JWKS or a raw JWKS in JSON format using the **SMART JSON Web Key Set (JWKS)** input.
 
 ## Inputs Controlling Token Responses
 
@@ -274,25 +200,73 @@ to respond with using the following inputs:
   If populated, ensure that the referenced resource is available in Inferno's simulated
   FHIR server so that it can be accessed.
 
+# Available Instances
+ 
+Inferno's simulated US Core server includes the following target instances for the test patient
+
+* **[US Core Patient Profile](http://hl7.org/fhir/us/core/StructureDefinition/us-core-patient|5.0.1)** (id: us-core-client-tests-patient)
+* **[US Core AllergyIntolerance Profile](http://hl7.org/fhir/us/core/StructureDefinition/us-core-allergyintolerance|5.0.1)** (id: us-core-client-tests-allergy-intolerance)
+* **[US Core CarePlan Profile](http://hl7.org/fhir/us/core/StructureDefinition/us-core-careplan|5.0.1)** (id: us-core-client-tests-care-plan)
+* **[US Core CareTeam Profile](http://hl7.org/fhir/us/core/StructureDefinition/us-core-careteam|5.0.1)** (id: us-core-client-tests-care-team)
+* **[US Core Condition Encounter Diagnosis Profile](http://hl7.org/fhir/us/core/StructureDefinition/us-core-condition-encounter-diagnosis|5.0.1)** (id: us-core-client-tests-condition-encounter-diagnosis)
+* **[US Core Condition Problems and Health Concerns Profile](http://hl7.org/fhir/us/core/StructureDefinition/us-core-condition-problems-health-concerns|5.0.1)** (id: us-core-client-tests-condition-problems-health-concerns)
+* **[US Core Implantable Device Profile](http://hl7.org/fhir/us/core/StructureDefinition/us-core-implantable-device|5.0.1)** (id: us-core-client-tests-device)
+* **[US Core DiagnosticReport Profile for Report and Note Exchange](http://hl7.org/fhir/us/core/StructureDefinition/us-core-diagnosticreport-note|5.0.1)** (id: us-core-client-tests-diagnostic-report-note)
+* **[US Core DiagnosticReport Profile for Laboratory Results Reporting](http://hl7.org/fhir/us/core/StructureDefinition/us-core-diagnosticreport-lab|5.0.1)** (id: us-core-client-tests-diagnostic-report-lab)
+* **[US Core DocumentReference Profile](http://hl7.org/fhir/us/core/StructureDefinition/us-core-documentreference|5.0.1)** (id: us-core-client-tests-document-reference)
+* **[US Core Encounter Profile](http://hl7.org/fhir/us/core/StructureDefinition/us-core-encounter|5.0.1)** (id: us-core-client-tests-encounter)
+* **[US Core Goal Profile](http://hl7.org/fhir/us/core/StructureDefinition/us-core-goal|5.0.1)** (id: us-core-client-tests-goal)
+* **[US Core Immunization Profile](http://hl7.org/fhir/us/core/StructureDefinition/us-core-immunization|5.0.1)** (id: us-core-client-tests-immunization)
+* **[US Core MedicationRequest Profile](http://hl7.org/fhir/us/core/StructureDefinition/us-core-medicationrequest|5.0.1)** (id: us-core-client-tests-medication-request)
+* **[US Core Laboratory Result Observation Profile](http://hl7.org/fhir/us/core/StructureDefinition/us-core-observation-lab|5.0.1)** (id: us-core-client-tests-observation-lab)
+* **[US Core Observation SDOH Assessment Profile](http://hl7.org/fhir/us/core/StructureDefinition/us-core-observation-sdoh-assessment|5.0.1)** (id: us-core-client-tests-observation-sdoh-assessment)
+* **[US Core Respiratory Rate Profile](http://hl7.org/fhir/us/core/StructureDefinition/us-core-respiratory-rate|5.0.1)** (id: us-core-client-tests-respiratory-rate)
+* **[US Core Observation Social History Profile](http://hl7.org/fhir/us/core/StructureDefinition/us-core-observation-social-history|5.0.1)** (id: us-core-client-tests-observation-social-history)
+* **[US Core Heart Rate Profile](http://hl7.org/fhir/us/core/StructureDefinition/us-core-heart-rate|5.0.1)** (id: us-core-client-tests-heart-rate)
+* **[US Core Body Temperature Profile](http://hl7.org/fhir/us/core/StructureDefinition/us-core-body-temperature|5.0.1)** (id: us-core-client-tests-body-temperature)
+* **[US Core Pediatric Weight for Height Observation Profile](http://hl7.org/fhir/us/core/StructureDefinition/pediatric-weight-for-height|5.0.1)** (id: us-core-client-tests-pediatric-weight-for-height)
+* **[US Core Pulse Oximetry Profile](http://hl7.org/fhir/us/core/StructureDefinition/us-core-pulse-oximetry|5.0.1)** (id: us-core-client-tests-pulse-oximetry)
+* **[US Core Smoking Status Observation Profile](http://hl7.org/fhir/us/core/StructureDefinition/us-core-smokingstatus|5.0.1)** (id: us-core-client-tests-smokingstatus)
+* **[US Core Observation Sexual Orientation Profile](http://hl7.org/fhir/us/core/StructureDefinition/us-core-observation-sexual-orientation|5.0.1)** (id: us-core-client-tests-observation-sexual-orientation)
+* **[US Core Head Circumference Profile](http://hl7.org/fhir/us/core/StructureDefinition/us-core-head-circumference|5.0.1)** (id: us-core-client-tests-head-circumference-percentile)
+* **[US Core Body Height Profile](http://hl7.org/fhir/us/core/StructureDefinition/us-core-body-height|5.0.1)** (id: us-core-client-tests-body-height)
+* **[US Core BMI Profile](http://hl7.org/fhir/us/core/StructureDefinition/us-core-bmi|5.0.1)** (id: us-core-client-tests-bmi)
+* **[US Core Blood Pressure Profile](http://hl7.org/fhir/us/core/StructureDefinition/us-core-blood-pressure|5.0.1)** (id: us-core-client-tests-blood-pressure)
+* **[US Core Observation Imaging Result Profile](http://hl7.org/fhir/us/core/StructureDefinition/us-core-observation-imaging|5.0.1)** (id: us-core-client-tests-observation-imaging)
+* **[US Core Observation Clinical Test Result Profile](http://hl7.org/fhir/us/core/StructureDefinition/us-core-observation-clinical-test|5.0.1)** (id: us-core-client-tests-observation-clinical-test)
+* **[US Core Pediatric BMI for Age Observation Profile](http://hl7.org/fhir/us/core/StructureDefinition/pediatric-bmi-for-age|5.0.1)** (id: us-core-client-tests-pediatric-bmi-for-age)
+* **[US Core Pediatric Head Occipital-frontal Circumference Percentile Profile](http://hl7.org/fhir/us/core/StructureDefinition/head-occipital-frontal-circumference-percentile|5.0.1)** (id: us-core-client-tests-head-circumference-percentile)
+* **[US Core Body Weight Profile](http://hl7.org/fhir/us/core/StructureDefinition/us-core-body-weight|5.0.1)** (id: us-core-client-tests-body-weight)
+* **[US Core Procedure Profile](http://hl7.org/fhir/us/core/StructureDefinition/us-core-procedure|5.0.1)** (id: us-core-client-tests-procedure)
+* **[US Core QuestionnaireResponse Profile](http://hl7.org/fhir/us/core/StructureDefinition/us-core-questionnaireresponse|5.0.1)** (id: us-core-client-tests-questionnaire-response)
+* **[US Core ServiceRequest Profile](http://hl7.org/fhir/us/core/StructureDefinition/us-core-servicerequest|5.0.1)** (id: us-core-client-tests-service-request)
+* **[US Core Organization Profile](http://hl7.org/fhir/us/core/StructureDefinition/us-core-organization|5.0.1)** (id: us-core-client-tests-organization)
+* **[US Core Practitioner Profile](http://hl7.org/fhir/us/core/StructureDefinition/us-core-practitioner|5.0.1)** (id: us-core-client-tests-practitioner)
+* **[US Core PractitionerRole Profile](http://hl7.org/fhir/us/core/StructureDefinition/us-core-practitionerrole|5.0.1)** (id: us-core-client-tests-practitioner-role)
+* **[US Core Provenance Profile](http://hl7.org/fhir/us/core/StructureDefinition/us-core-provenance|5.0.1)** (id: us-core-client-tests-provenance)
+* **[US Core RelatedPerson Profile](http://hl7.org/fhir/us/core/StructureDefinition/us-core-relatedperson|5.0.1)** (id: us-core-client-tests-related-person)
+
 # Current Limitations
 
 This test suite is still in draft form and does not test all of the client requirements and features
 described in the US Core Implementation guide.
 
-The current version of this test suite supports:
+The current version of this test suite supports the following tests using a specific Inferno-specified patient:
 - Testing a client's ability to perform read requests against a FHIR server for all US Core Profiles
-summarized in the US Core Capability Statement.
-- Testing a client's ability to perform searches using the SHALL conformance search parameters
-summarized in the US Core Capability Statement.
+  listed in the [US Core Client CapabilityStatement](http://hl7.org/fhir/us/core/STU5.0.1/CapabilityStatement-us-core-client.html).
+- Testing a client's ability to perform searches using search parameters and combinations
+  listed for each resource type in the [US Core Client CapabilityStatement](http://hl7.org/fhir/us/core/STU5.0.1/CapabilityStatement-us-core-client.html).
 
-The current version of this test suite does not support:
-- Testing searches with/via:
+The current version of this test suite does not:
+- Support esting searches with/via:
   - date comparator
   - multiple-OR
   - _revInclude
-  - The client SHALL provide values precise to the day for elements of datatype date and to the second + time offset for elements of datatype dateTime.
-- The Must Support Conformance Requirements for clients/requestors specified in US Core IG v5.0.1
-- Clients that cannot follow the SMART App Launch or UDAP Consumer-Facing OAuth flows to obtain an access token.
+- Verify that date and dateTime search parameter values are provided at the required level of precision.
+- Check the Must Support Conformance Requirements for clients/requestors specified in US Core IG v5.0.1
+- Support clients that cannot follow the SMART App Launch OAuth flow to obtain an access token.
+- Allow testers to bring their own data. Testers must manually configure their client system to connect
+  to a specific target patient and must access and process specific curated sample US Core data.
 
 
         )
@@ -312,6 +286,10 @@ The current version of this test suite does not support:
             type: 'download',
             label: 'Download',
             url: 'https://github.com/inferno-framework/us-core-test-kit/releases/'
+          },
+          {
+            label: 'Implementation Guide',
+            url: 'http://hl7.org/fhir/us/core/STU5.0.1'
           }
         ]
 
@@ -329,17 +307,10 @@ The current version of this test suite does not support:
                         {
                           label: 'SMART App Launch Confidential Asymmetric Client',
                           value: USCoreClientOptions::SMART_APP_LAUNCH_CONFIDENTIAL_ASYMMETRIC
-                        },
-                        {
-                          label: 'UDAP Authorization Code Client',
-                          value: USCoreClientOptions::UDAP_AUTHORIZATION_CODE
                         }
                       ]
 
         route(:get, METADATA_PATH, USCoreTestKit::Client::MetadataHelper.get_metadata('v501'))
-        route(:get, UDAPSecurityTestKit::UDAP_DISCOVERY_PATH, lambda { |_env|
-          UDAPSecurityTestKit::MockUDAPServer.udap_server_metadata(id)
-        })
         route(:get, SMARTAppLaunch::SMART_DISCOVERY_PATH, lambda { |_env|
           SMARTAppLaunch::MockSMARTServer.smart_server_metadata(id)
         })
@@ -350,11 +321,9 @@ The current version of this test suite does not support:
           ->(_env) { [200, { 'Content-Type' => 'application/json' }, [SMARTAppLaunch::OIDCJWKS.jwks_json]] }
         )
 
-        suite_endpoint :post, UDAPSecurityTestKit::REGISTRATION_PATH,
-                        UDAPSecurityTestKit::MockUDAPServer::RegistrationEndpoint
-        suite_endpoint :post, UDAPSecurityTestKit::TOKEN_PATH, MockUdapSmartServer::TokenEndpoint
-        suite_endpoint :get,  UDAPSecurityTestKit::AUTHORIZATION_PATH, MockUdapSmartServer::AuthorizationEndpoint
-        suite_endpoint :post, UDAPSecurityTestKit::AUTHORIZATION_PATH, MockUdapSmartServer::AuthorizationEndpoint
+        suite_endpoint :post, SMARTAppLaunch::TOKEN_PATH, SMARTAppLaunch::MockSMARTServer::TokenEndpoint
+        suite_endpoint :get,  SMARTAppLaunch::AUTHORIZATION_PATH, SMARTAppLaunch::MockSMARTServer::AuthorizationEndpoint
+        suite_endpoint :post, SMARTAppLaunch::AUTHORIZATION_PATH, SMARTAppLaunch::MockSMARTServer::AuthorizationEndpoint
 
         suite_endpoint :post, SEARCH_POST_ROUTE, SearchEndpoint
         suite_endpoint :get, SEARCH_ROUTE, SearchEndpoint
@@ -369,27 +338,15 @@ The current version of this test suite does not support:
         group do
           id :us_core_client_read_search_group_v501
           title 'Read & Search'
+          description %(
+            
+During these tests, the US Core client system will interact with Inferno's simulated US Core Server
+and demonstrate its ability to perform the FHIR interactions described in the [US Core Client CapabilityStatement](http://hl7.org/fhir/us/core/STU5.0.1/CapabilityStatement-us-core-client.html).
+
+
+          )
 
-          run_as_group
-
-          group from: :us_core_client_wait_group_v501
-
-          group from: :us_core_client_v501_auth_smart_alca,
-              required_suite_options: {
-                client_type: USCoreClientOptions::SMART_APP_LAUNCH_CONFIDENTIAL_ASYMMETRIC
-              }
-          group from: :us_core_client_v501_auth_smart_alcs,
-                required_suite_options: {
-                  client_type: USCoreClientOptions::SMART_APP_LAUNCH_CONFIDENTIAL_SYMMETRIC
-                }
-          group from: :us_core_client_v501_auth_smart_alp,
-                required_suite_options: {
-                  client_type: USCoreClientOptions::SMART_APP_LAUNCH_PUBLIC
-                }
-          group from: :us_core_client_v501_auth_udap,
-                required_suite_options: {
-                  client_type: USCoreClientOptions::UDAP_AUTHORIZATION_CODE
-                }
+          group from: :us_core_client_access_group_v501
 
           group from: :us_core_client_v501_patient
           group from: :us_core_client_v501_allergy_intolerance
@@ -432,6 +389,16 @@ The current version of this test suite does not support:
           group from: :us_core_client_v501_practitioner_role
           group from: :us_core_client_v501_provenance
           group from: :us_core_client_v501_related_person
+
+          run do
+            passing_profile_group = groups.find do |group|
+              next if group.id.include?('wait') || group.id.include?('auth')
+
+              results[group.id]&.result == 'pass'
+            end
+
+            assert passing_profile_group.present?, 'At least one profile group must pass.'
+          end
         end
       end
     end