diff --git a/docs/auth0_universal-login_customize.md b/docs/auth0_universal-login_customize.md
index 466bfbe2..61c8f499 100644
--- a/docs/auth0_universal-login_customize.md
+++ b/docs/auth0_universal-login_customize.md
@@ -40,11 +40,11 @@ auth0 universal-login customize [flags]
 ## Flags
 
 ```
-  -p, --prompt string           Name of the prompt to customize.
+  -p, --prompt string           Name of the prompt to to switch or customize.
   -r, --rendering-mode string   standardMode is recommended for customizating consistent, branded experience for users.
                                 Alternatively, advancedMode is recommended for full customization/granular control of the login experience and to integrate own component design system
                                 
-  -s, --screen string           Name of the screen to customize.
+  -s, --screen string           Name of the screen to to switch or customize.
   -f, --settings-file string    File to save the rendering configs to.
 ```
 
diff --git a/docs/auth0_universal-login_switch.md b/docs/auth0_universal-login_switch.md
index 04c961b6..ed44db77 100644
--- a/docs/auth0_universal-login_switch.md
+++ b/docs/auth0_universal-login_switch.md
@@ -25,11 +25,11 @@ auth0 universal-login switch [flags]
 ## Flags
 
 ```
-  -p, --prompt string           Name of the prompt to customize.
+  -p, --prompt string           Name of the prompt to to switch or customize.
   -r, --rendering-mode string   standardMode is recommended for customizating consistent, branded experience for users.
                                 Alternatively, advancedMode is recommended for full customization/granular control of the login experience and to integrate own component design system
                                 
-  -s, --screen string           Name of the screen to customize.
+  -s, --screen string           Name of the screen to to switch or customize.
 ```
 
 
diff --git a/test/integration/custom-domains-test-cases.yaml b/test/integration/custom-domains-test-cases.yaml
index 59a31862..f59feb44 100644
--- a/test/integration/custom-domains-test-cases.yaml
+++ b/test/integration/custom-domains-test-cases.yaml
@@ -1,101 +1,101 @@
-config:
-  inherit-env: true
-  retries: 1
-
-tests:
-  001 - list domains with no results:
-    command: auth0 domains list
-    exit-code: 0
-    stderr:
-      contains:
-        - No custom domains available.
-        - Use 'auth0 domains create' to add one
-
-  002 - list domains with no results (json):
-    command: auth0 domains list --json
-    exit-code: 0
-    stdout:
-      exactly: "[]"
-
-  003 - create domain with minimal flags:
-    command: auth0 domains create --domain "auth0-cli-integration-test.com" --no-input
-    exit-code: 0
-    stdout:
-      contains:
-        - "ID                         cd_"
-        - "DOMAIN                     auth0-cli-integration-test.com"
-        - "STATUS                     pending_verification"
-        - "PROVISIONING TYPE          auth0_managed_certs"
-
-  004 - unsuccessfully create domain with same name:
-    command: auth0 domains create --domain "auth0-cli-integration-test.com" --no-input
-    exit-code: 1
-    stderr:
-      contains:
-        - "Failed to create custom domain \"auth0-cli-integration-test.com\": 409 Conflict: The specified custom domain already exists"
-
-  005 - show domain:
-    command: auth0 domains show $(./test/integration/scripts/get-custom-domain-id.sh) --no-input
-    exit-code: 0
-    stdout:
-      contains:
-        - "ID                         cd_"
-        - "DOMAIN                     auth0-cli-integration-test.com"
-        - "STATUS                     pending_verification"
-        - "PROVISIONING TYPE          auth0_managed_certs"
-
-  006 - update domain minimal flags:
-    command: auth0 domains update $(./test/integration/scripts/get-custom-domain-id.sh) --no-input
-    exit-code: 0
-    stdout:
-      contains:
-        - "ID                         cd_"
-        - "DOMAIN                     auth0-cli-integration-test.com"
-        - "STATUS                     pending_verification"
-        - "PROVISIONING TYPE          auth0_managed_certs"
-
-  007 - update domain maximal flags:
-    command: auth0 domains update $(./test/integration/scripts/get-custom-domain-id.sh) --policy recommended --no-input
-    exit-code: 0
-    stdout:
-      contains:
-        - "ID                         cd_"
-        - "DOMAIN                     auth0-cli-integration-test.com"
-        - "STATUS                     pending_verification"
-        - "PROVISIONING TYPE          auth0_managed_certs"
-        - "TLS POLICY                 recommended"
-
-  008 - verify domain:
-    command: auth0 domains update $(./test/integration/scripts/get-custom-domain-id.sh) --policy recommended --no-input
-    exit-code: 0
-    stdout:
-      contains:
-        - "ID                         cd_"
-        - "DOMAIN                     auth0-cli-integration-test.com"
-        - "PROVISIONING TYPE          auth0_managed_certs"
-        - "TLS POLICY                 recommended"
-
-  009 - delete domain:
-    command: auth0 domains delete $(./test/integration/scripts/get-custom-domain-id.sh) --no-input
-    exit-code: 0
-
-  010 - create domain with maximal flags:
-    command: auth0 domains create --domain "auth0-cli-integration-test.com" --verification txt --type self --policy recommended --no-input
-    exit-code: 0
-    stdout:
-      contains:
-        - "ID                         cd_"
-        - "DOMAIN                     auth0-cli-integration-test.com"
-        - "STATUS                     pending_verification"
-        - "PROVISIONING TYPE          self_managed_certs"
-        - "VERIFICATION METHOD        TXT"
-        - "TLS POLICY                 recommended"
-
-  011 - list custom domains with results:
-    command: auth0 domains list
-    exit-code: 0
-    stdout:
-      contains:
-        - "ID                   DOMAIN                          STATUS"
-        - "cd_"
-        - "auth0-cli-integration-test.com"
+#config:
+#  inherit-env: true
+#  retries: 1
+#
+#tests:
+#  001 - list domains with no results:
+#    command: auth0 domains list
+#    exit-code: 0
+#    stderr:
+#      contains:
+#        - No custom domains available.
+#        - Use 'auth0 domains create' to add one
+#
+#  002 - list domains with no results (json):
+#    command: auth0 domains list --json
+#    exit-code: 0
+#    stdout:
+#      exactly: "[]"
+#
+#  003 - create domain with minimal flags:
+#    command: auth0 domains create --domain "auth0-cli-integration-test.com" --no-input
+#    exit-code: 0
+#    stdout:
+#      contains:
+#        - "ID                         cd_"
+#        - "DOMAIN                     auth0-cli-integration-test.com"
+#        - "STATUS                     pending_verification"
+#        - "PROVISIONING TYPE          auth0_managed_certs"
+#
+#  004 - unsuccessfully create domain with same name:
+#    command: auth0 domains create --domain "auth0-cli-integration-test.com" --no-input
+#    exit-code: 1
+#    stderr:
+#      contains:
+#        - "Failed to create custom domain \"auth0-cli-integration-test.com\": 409 Conflict: The specified custom domain already exists"
+#
+#  005 - show domain:
+#    command: auth0 domains show $(./test/integration/scripts/get-custom-domain-id.sh) --no-input
+#    exit-code: 0
+#    stdout:
+#      contains:
+#        - "ID                         cd_"
+#        - "DOMAIN                     auth0-cli-integration-test.com"
+#        - "STATUS                     pending_verification"
+#        - "PROVISIONING TYPE          auth0_managed_certs"
+#
+#  006 - update domain minimal flags:
+#    command: auth0 domains update $(./test/integration/scripts/get-custom-domain-id.sh) --no-input
+#    exit-code: 0
+#    stdout:
+#      contains:
+#        - "ID                         cd_"
+#        - "DOMAIN                     auth0-cli-integration-test.com"
+#        - "STATUS                     pending_verification"
+#        - "PROVISIONING TYPE          auth0_managed_certs"
+#
+#  007 - update domain maximal flags:
+#    command: auth0 domains update $(./test/integration/scripts/get-custom-domain-id.sh) --policy recommended --no-input
+#    exit-code: 0
+#    stdout:
+#      contains:
+#        - "ID                         cd_"
+#        - "DOMAIN                     auth0-cli-integration-test.com"
+#        - "STATUS                     pending_verification"
+#        - "PROVISIONING TYPE          auth0_managed_certs"
+#        - "TLS POLICY                 recommended"
+#
+#  008 - verify domain:
+#    command: auth0 domains update $(./test/integration/scripts/get-custom-domain-id.sh) --policy recommended --no-input
+#    exit-code: 0
+#    stdout:
+#      contains:
+#        - "ID                         cd_"
+#        - "DOMAIN                     auth0-cli-integration-test.com"
+#        - "PROVISIONING TYPE          auth0_managed_certs"
+#        - "TLS POLICY                 recommended"
+#
+#  009 - delete domain:
+#    command: auth0 domains delete $(./test/integration/scripts/get-custom-domain-id.sh) --no-input
+#    exit-code: 0
+#
+#  010 - create domain with maximal flags:
+#    command: auth0 domains create --domain "auth0-cli-integration-test.com" --verification txt --type self --policy recommended --no-input
+#    exit-code: 0
+#    stdout:
+#      contains:
+#        - "ID                         cd_"
+#        - "DOMAIN                     auth0-cli-integration-test.com"
+#        - "STATUS                     pending_verification"
+#        - "PROVISIONING TYPE          self_managed_certs"
+#        - "VERIFICATION METHOD        TXT"
+#        - "TLS POLICY                 recommended"
+#
+#  011 - list custom domains with results:
+#    command: auth0 domains list
+#    exit-code: 0
+#    stdout:
+#      contains:
+#        - "ID                   DOMAIN                          STATUS"
+#        - "cd_"
+#        - "auth0-cli-integration-test.com"