diff --git a/ods_ci/tests/Resources/Page/Components/Components.resource b/ods_ci/tests/Resources/Page/Components/Components.resource
index 1894256ac..c5cf56b2e 100644
--- a/ods_ci/tests/Resources/Page/Components/Components.resource
+++ b/ods_ci/tests/Resources/Page/Components/Components.resource
@@ -1,2 +1,120 @@
 *** Settings ***
 Resource  Menu.robot
+Resource  ../../OCP.resource
+Resource  ../../ODS.robot
+
+
+*** Keywords ***
+Set DSC Component Removed State And Wait For Completion
+    [Documentation]    Set component management state to 'Removed', and wait for deployment and pod to be removed.
+    [Arguments]    ${component}    ${deployment_name}    ${label_selector}
+
+    ${management_state}=    Get DSC Component State    ${DSC_NAME}    ${component}    ${OPERATOR_NS}
+    IF    "${management_state}" != "Removed"
+            Set Component State    ${component}    Removed
+    END
+
+    Wait For Resources To Be Removed    ${deployment_name}    ${label_selector}
+
+Set DSC Component Managed State And Wait For Completion
+    [Documentation]    Set component management state to 'Managed', and wait for deployment and pod to be available.
+    [Arguments]    ${component}    ${deployment_name}    ${label_selector}
+
+    ${management_state}=    Get DSC Component State    ${DSC_NAME}    ${component}    ${OPERATOR_NS}
+    IF    "${management_state}" != "Managed"
+            Set Component State    ${component}    Managed
+    END
+
+    Wait For Resources To Be Available    ${deployment_name}    ${label_selector}
+
+    Check Image Pull Path Is Redhatio    ${deployment_name}
+
+Wait For Resources To Be Available
+    [Documentation]    Wait until Deployment and Pod(s) are Available
+    [Arguments]    ${deployment_name}    ${label_selector}
+    Wait Until Keyword Succeeds    5 min    0 sec
+    ...    Is Resource Present     Deployment    ${deployment_name}    ${APPLICATIONS_NS}    ${IS_PRESENT}
+
+    Wait Until Keyword Succeeds    5 min    0 sec
+    ...    Check If Pod Exists    ${APPLICATIONS_NS}    ${label_selector}    ${FALSE}
+
+    Wait Until Keyword Succeeds    8 min    0 sec
+    ...    Is Pod Ready    ${label_selector}
+
+Wait For Resources To Be Removed
+    [Documentation]    Wait until Deployment and Pod(s) to Removed
+    [Arguments]    ${deployment_name}    ${label_selector}
+
+    Wait Until Keyword Succeeds    5 min    0 sec
+    ...    Is Resource Present     Deployment    ${deployment_name}    ${APPLICATIONS_NS}    ${IS_NOT_PRESENT}
+
+    Wait Until Keyword Succeeds    5 min    0 sec
+    ...    Check If Pod Does Not Exist    ${label_selector}    ${APPLICATIONS_NS}
+
+Restore DSC Component State
+    [Documentation]    Set component management state to original state, wait for component resources to be available.
+    [Arguments]    ${component}    ${deployment_name}    ${LABEL_SELECTOR}    ${saved_state}
+
+    ${current_state}=    Get DSC Component State    ${DSC_NAME}    ${component}    ${OPERATOR_NS}
+    IF    "${current_state}" != "${saved_state}"
+        IF    "${saved_state}" == "Managed"
+            Set DSC Component Managed State And Wait For Completion    ${component}    ${deployment_name}    ${LABEL_SELECTOR}
+        ELSE IF    "${saved_state}" == "Removed"
+            Set DSC Component Removed State And Wait For Completion    ${component}    ${deployment_name}    ${LABEL_SELECTOR}
+        ELSE
+            FAIL    Component ${component} state "${saved_state}" not supported at this time
+        END
+    END
+
+Is Pod Ready
+    [Documentation]    Check If Pod Is In Ready State.
+    ...    Note: Will check that all pods with given label-selector are in Ready state.
+    [Arguments]    ${label_selector}
+    ${rc}    ${output}=    Run And Return Rc And Output
+    ...    oc get pod -A -l ${label_selector} -o jsonpath='{..status.conditions[?(@.type=="Ready")].status}'
+    # Log To Console    "Pod Ready Status: ${output}"
+    Should Be Equal As Integers    ${rc}    0
+    Should Not Contain    ${output}    False
+
+Get DataScienceCluster Spec
+    [Documentation]    Return the DSC Spec
+    [Arguments]    ${DSC_NAME}
+    ${rc}   ${output}=    Run And Return Rc And Output
+    ...    oc get DataScienceCluster/${DSC_NAME} -n ${OPERATOR_NS} -o "jsonpath={".spec"}"
+    Should Be Equal As Integers    ${rc}    0
+    RETURN    ${output}
+
+Check Image Pull Path Is Redhatio
+    [Documentation]    Check that the Deployment Image Pull Path is registry.redhat.io
+    [Arguments]    ${deployment_name}
+
+    # Skip pull path check if Deployment is in exclusion list
+    IF    $deployment_name in @{REDHATIO_PATH_CHECK_EXCLUSTION_LIST}
+        Log To Console    Skip image pull path check for Deployment ${deployment_name}
+        RETURN
+    END
+
+    ${rc}   ${image}=    Run And Return Rc And Output
+    ...    oc get deployment/${deployment_name} -n ${APPLICATIONS_NAMESPACE} -o jsonpath="{..image}"
+    Should Be Equal As Integers    ${rc}    0    msg=${image}
+
+    Log To Console    Check deployment ${deployment_name} pull path for image ${image}
+    IF  "registry.redhat.io" in $image
+        Log To Console    Deployment ${deployment_name} image contains pull path registry.redhat.io
+    ELSE
+        Fail    Deployment image  ${deployment_name} does not contain pull path registry.redhat.io
+    END
+
+Check Model Registry Namespace
+    [Documentation]    Check that DSC modelregistry.registriesNamespace is correct for ODH/RHOAI
+    ...    Validate that namespace exists.
+
+    ${rc}   ${namespace}=    Run And Return Rc And Output
+    ...    oc get DataScienceCluster/${DSC_NAME} -n ${OPERATOR_NS} -o "jsonpath={".spec.components.modelregistry.registriesNamespace"}"
+    Should Be Equal As Integers    ${rc}    0    msg=${namespace}
+
+    Should Be Equal    ${namespace}    ${MODEL_REGISTRY_NAMESPACE}    msg=Model Registry Namespace: Actual "${namespace}" Expected: "${MODEL_REGISTRY_NAMESPACE}"
+
+    ${rc}   ${output}=    Run And Return Rc And Output
+    ...    oc get namespace -A ${MODEL_REGISTRY_NAMESPACE}
+    Should Be Equal As Integers    ${rc}    0    msg=${output}
diff --git a/ods_ci/tests/Tests/0100__platform/0101__deploy/0104__operators/0104__rhods_operator/0113__dsc_components.robot b/ods_ci/tests/Tests/0100__platform/0101__deploy/0104__operators/0104__rhods_operator/0113__dsc_components.robot
index e164433fe..d3f9dd021 100644
--- a/ods_ci/tests/Tests/0100__platform/0101__deploy/0104__operators/0104__rhods_operator/0113__dsc_components.robot
+++ b/ods_ci/tests/Tests/0100__platform/0101__deploy/0104__operators/0104__rhods_operator/0113__dsc_components.robot
@@ -5,6 +5,7 @@ Library             Collections
 Resource            ../../../../../Resources/OCP.resource
 Resource            ../../../../../Resources/ODS.robot
 Resource            ../../../../../../tasks/Resources/RHODS_OLM/install/oc_install.robot
+Resource            ../../../../../Resources/Page/Components/Components.resource
 Suite Setup         Suite Setup
 Suite Teardown      Suite Teardown
 
@@ -312,117 +313,3 @@ Check Controller Conditions Are Accomplished
     Should Match    ${d_obj_dictionary.spec.template.spec.containers[0].resources.limits.cpu}    ${cpu_limit}
     Should Match    ${d_obj_dictionary.spec.template.spec.containers[0].resources.limits.memory}    ${memory_limit}
     Should Not Match    ${d_obj_dictionary.spec.template.spec.serviceAccountName}    random-sa-name
-
-Set DSC Component Removed State And Wait For Completion
-    [Documentation]    Set component management state to 'Removed', and wait for deployment and pod to be removed.
-    [Arguments]    ${component}    ${deployment_name}    ${label_selector}
-
-    ${management_state}=    Get DSC Component State    ${DSC_NAME}    ${component}    ${OPERATOR_NS}
-    IF    "${management_state}" != "Removed"
-            Set Component State    ${component}    Removed
-    END
-
-    Wait For Resources To Be Removed    ${deployment_name}    ${label_selector}
-
-Set DSC Component Managed State And Wait For Completion
-    [Documentation]    Set component management state to 'Managed', and wait for deployment and pod to be available.
-    [Arguments]    ${component}    ${deployment_name}    ${label_selector}
-
-    ${management_state}=    Get DSC Component State    ${DSC_NAME}    ${component}    ${OPERATOR_NS}
-    IF    "${management_state}" != "Managed"
-            Set Component State    ${component}    Managed
-    END
-
-    Wait For Resources To Be Available    ${deployment_name}    ${label_selector}
-
-    Check Image Pull Path Is Redhatio    ${deployment_name}
-
-Wait For Resources To Be Available
-    [Documentation]    Wait until Deployment and Pod(s) are Available
-    [Arguments]    ${deployment_name}    ${label_selector}
-    Wait Until Keyword Succeeds    5 min    0 sec
-    ...    Is Resource Present     Deployment    ${deployment_name}    ${APPLICATIONS_NS}    ${IS_PRESENT}
-
-    Wait Until Keyword Succeeds    5 min    0 sec
-    ...    Check If Pod Exists    ${APPLICATIONS_NS}    ${label_selector}    ${FALSE}
-
-    Wait Until Keyword Succeeds    8 min    0 sec
-    ...    Is Pod Ready    ${label_selector}
-
-Wait For Resources To Be Removed
-    [Documentation]    Wait until Deployment and Pod(s) to Removed
-    [Arguments]    ${deployment_name}    ${label_selector}
-
-    Wait Until Keyword Succeeds    5 min    0 sec
-    ...    Is Resource Present     Deployment    ${deployment_name}    ${APPLICATIONS_NS}    ${IS_NOT_PRESENT}
-
-    Wait Until Keyword Succeeds    5 min    0 sec
-    ...    Check If Pod Does Not Exist    ${label_selector}    ${APPLICATIONS_NS}
-
-Restore DSC Component State
-    [Documentation]    Set component management state to original state, wait for component resources to be available.
-    [Arguments]    ${component}    ${deployment_name}    ${LABEL_SELECTOR}    ${saved_state}
-
-    ${current_state}=    Get DSC Component State    ${DSC_NAME}    ${component}    ${OPERATOR_NS}
-    IF    "${current_state}" != "${saved_state}"
-        IF    "${saved_state}" == "Managed"
-            Set DSC Component Managed State And Wait For Completion    ${component}    ${deployment_name}    ${LABEL_SELECTOR}
-        ELSE IF    "${saved_state}" == "Removed"
-            Set DSC Component Removed State And Wait For Completion    ${component}    ${deployment_name}    ${LABEL_SELECTOR}
-        ELSE
-            FAIL    Component ${component} state "${saved_state}" not supported at this time
-        END
-    END
-
-Is Pod Ready
-    [Documentation]    Check If Pod Is In Ready State.
-    ...    Note: Will check that all pods with given label-selector are in Ready state.
-    [Arguments]    ${label_selector}
-    ${rc}    ${output}=    Run And Return Rc And Output
-    ...    oc get pod -A -l ${label_selector} -o jsonpath='{..status.conditions[?(@.type=="Ready")].status}'
-    # Log To Console    "Pod Ready Status: ${output}"
-    Should Be Equal As Integers    ${rc}    0
-    Should Not Contain    ${output}    False
-
-Get DataScienceCluster Spec
-    [Documentation]    Return the DSC Spec
-    [Arguments]    ${DSC_NAME}
-    ${rc}   ${output}=    Run And Return Rc And Output
-    ...    oc get DataScienceCluster/${DSC_NAME} -n ${OPERATOR_NS} -o "jsonpath={".spec"}"
-    Should Be Equal As Integers    ${rc}    0
-    RETURN    ${output}
-
-Check Image Pull Path Is Redhatio
-    [Documentation]    Check that the Deployment Image Pull Path is registry.redhat.io
-    [Arguments]    ${deployment_name}
-
-    # Skip pull path check if Deployment is in exclusion list
-    IF    $deployment_name in @{REDHATIO_PATH_CHECK_EXCLUSTION_LIST}
-        Log To Console    Skip image pull path check for Deployment ${deployment_name}
-        RETURN
-    END
-
-    ${rc}   ${image}=    Run And Return Rc And Output
-    ...    oc get deployment/${deployment_name} -n ${APPLICATIONS_NAMESPACE} -o jsonpath="{..image}"
-    Should Be Equal As Integers    ${rc}    0    msg=${image}
-
-    Log To Console    Check deployment ${deployment_name} pull path for image ${image}
-    IF  "registry.redhat.io" in $image
-        Log To Console    Deployment ${deployment_name} image contains pull path registry.redhat.io
-    ELSE
-        Fail    Deployment image  ${deployment_name} does not contain pull path registry.redhat.io
-    END
-
-Check Model Registry Namespace
-    [Documentation]    Check that DSC modelregistry.registriesNamespace is correct for ODH/RHOAI
-    ...    Validate that namespace exists.
-
-    ${rc}   ${namespace}=    Run And Return Rc And Output
-    ...    oc get DataScienceCluster/${DSC_NAME} -n ${OPERATOR_NS} -o "jsonpath={".spec.components.modelregistry.registriesNamespace"}"
-    Should Be Equal As Integers    ${rc}    0    msg=${namespace}
-
-    Should Be Equal    ${namespace}    ${MODEL_REGISTRY_NAMESPACE}    msg=Model Registry Namespace: Actual "${namespace}" Expected: "${MODEL_REGISTRY_NAMESPACE}"
-
-    ${rc}   ${output}=    Run And Return Rc And Output
-    ...    oc get namespace -A ${MODEL_REGISTRY_NAMESPACE}
-    Should Be Equal As Integers    ${rc}    0    msg=${output}