diff --git a/.github/workflows/quickget-tests.yml b/.github/workflows/quickget-tests.yml
index 6bbf0d7..dc44b88 100644
--- a/.github/workflows/quickget-tests.yml
+++ b/.github/workflows/quickget-tests.yml
@@ -92,7 +92,7 @@ jobs:
           echo -e "\n\n               ISOs:\n\n"
           mkdir -p results
           for os in ${distros}; do
-            echo -e "\n\n      ${os}" && ./quickget -ua "${os}" | tee -a results/urls.txt
+            echo -e "\n\n      ${os}" && ./quickget -u "${os}" | tee -a results/urls.txt
           done
           echo -e "\n\nFounded/All URLs: $(cat results/urls.txt | grep 'http' | wc -l)/$(cat results/supported.txt | wc -l)"
           echo -e "\n\n               Finished\n\n"
@@ -114,7 +114,7 @@ jobs:
           echo -e "\n\n               ISOs availability:\n\n"
           mkdir -p results
           for os in ${distros}; do
-            echo -e "\n\n      ${os}" && ./quickget -ca "${os}" | tee -a results/checks.txt
+            echo -e "\n\n      ${os}" && ./quickget -c "${os}" | tee -a results/checks.txt
           done
           ALL=$(cat results/checks.txt | grep 'http' | wc -l)
           FAILED=$(grep -c 'FAIL:' results/checks.txt)
diff --git a/quickget b/quickget
index f23dc15..2010b00 100755
--- a/quickget
+++ b/quickget
@@ -486,6 +486,7 @@ function test_all() {
             fi
         fi
     done
+    exit 0
 }
 
 function os_support() {
@@ -3366,10 +3367,8 @@ Arguments:
  --version        (-v)                : Show version
  --help           (-h)                : Show this help message
 -------------- For testing & development ---------------------
- --url            (-u) <os> <re> [ed] : Show download URL for an OS release/edition
- --url-all       (-ua) [os]           : Show all download URLs [for an OS]
- --check          (-c) <os> [re] [ed] : Check download an OS release/edition is available
- --check-all     (-ca) [os]           : Check all downloads [for an OS] are available
+ --url            (-u) [os] [re] [ed] : Show download URL for what specified or All
+ --check          (-c) [os] [re] [ed] : Check download for what specified or All
  --list           (-l)                : List all supported systems in plain text
  --list-csv      (-lc)                : List all supported systems in csv format
  --list-json     (-lj)                : List all supported systems in json format
@@ -3427,36 +3426,24 @@ case "${1}" in
   '--url'|'-u')
     OPERATION="show"
     shift
-    ;;
-  '--url-all'|'-ua')
-    OPERATION="show"
-    shift
-    # if no OS is specified, list all URLs for all supported OSes
     if [ -z "${1}" ]; then
         for OS in $(os_support); do
             (test_all "${OS}")
         done
-    else
+    elif [ -z "${2}" ]; then
         test_all "${1}"
     fi
-    exit 0
     ;;
   '--check'|'-c')
     OPERATION="test"
     shift
-    ;;
-  '--check-all'|'-ca')
-    OPERATION="test"
-    shift
-    # if no OS is specified, check all URLs for all supported OSes
     if [ -z "${1}" ]; then
         for OS in $(os_support); do
             (test_all "${OS}")
         done
-    else
+    elif [ -z "${2}" ]; then
         test_all "${1}"
     fi
-    exit 0
     ;;
     #TODO: Argument without dashes should be DEPRECATED!
   '--list-csv'|'-lc'|'list'|'list_csv'|'lc')