diff --git a/.github/workflows/run-all-tests.yml b/.github/workflows/run-all-tests.yml
index 1ff795d..ff0e121 100644
--- a/.github/workflows/run-all-tests.yml
+++ b/.github/workflows/run-all-tests.yml
@@ -31,14 +31,14 @@ jobs:
           run: docker-compose up -d --build
         - name: Run test suite on CentOS7
           run: test/run-test.sh centos7
-  test-centos7-duckdns:
+  test-centos7-staging:
     runs-on: ubuntu-latest
     steps:
       - uses: actions/checkout@v1
       - name: Build the docker-compose stack
         run: docker-compose up -d --build
       - name: Run test suite on CentOS7 against Staging using DuckDNS
-        run: test/run-test.sh centos7-duckdns
+        run: test/run-test.sh centos7-staging
   test-debian:
     runs-on: ubuntu-latest
     steps:
@@ -71,11 +71,11 @@ jobs:
         run: docker-compose up -d --build
       - name: Run test suite on Ubuntu18
         run: test/run-test.sh ubuntu18
-  test-ubuntu-duckdns:
+  test-ubuntu-staging:
     runs-on: ubuntu-latest
     steps:
       - uses: actions/checkout@v1
       - name: Build the docker-compose stack
         run: docker-compose up -d --build
       - name: Run test suite on Ubuntu against Staging using DuckDNS
-        run: test/run-test.sh ubuntu-duckdns
+        run: test/run-test.sh ubuntu-staging
diff --git a/test/10-mixed-case-staging.bats b/test/10-mixed-case-staging.bats
new file mode 100644
index 0000000..c1bac0d
--- /dev/null
+++ b/test/10-mixed-case-staging.bats
@@ -0,0 +1,24 @@
+#! /usr/bin/env bats
+
+load '/bats-support/load.bash'
+load '/bats-assert/load.bash'
+load '/getssl/test/test_helper.bash'
+
+
+@test "Check can create certificate if domain is not lowercase using staging server and DuckDNS" {
+    if [ -z "$STAGING" ]; then
+        skip "Running internal tests, skipping external test"
+    fi
+
+    CONFIG_FILE="getssl-staging-dns01.cfg"
+    GETSSL_CMD_HOST=$(echo $GETSSL_HOST | tr a-z A-Z)
+
+    setup_environment
+    init_getssl
+    create_certificate
+
+    assert_success
+    refute_output --regexp '[Ff][Aa][Ii][Ll][Ee][Dd]'
+    refute_output --regexp '[Ee][Rr][Rr][Oo][Rr]'
+    refute_output --regexp '[Ww][Aa][Rr][Nn][Ii][Nn][Gg]'
+}
diff --git a/test/10-mixed-case.bats b/test/10-mixed-case.bats
new file mode 100644
index 0000000..2a4d6f3
--- /dev/null
+++ b/test/10-mixed-case.bats
@@ -0,0 +1,45 @@
+#! /usr/bin/env bats
+
+load '/bats-support/load.bash'
+load '/bats-assert/load.bash'
+load '/getssl/test/test_helper.bash'
+
+
+# This is run for every test
+setup() {
+    export CURL_CA_BUNDLE=/root/pebble-ca-bundle.crt
+}
+
+@test "Check that HTTP-01 verification works if the domain is not lowercase" {
+    if [ -n "$STAGING" ]; then
+        skip "Using staging server, skipping internal test"
+    fi
+
+    CONFIG_FILE="getssl-http01.cfg"
+    GETSSL_CMD_HOST=$(echo $GETSSL_HOST | tr a-z A-Z)
+
+    setup_environment
+    init_getssl
+    create_certificate
+
+    assert_success
+    refute_output --regexp '[Ff][Aa][Ii][Ll][Ee][Dd]'
+    refute_output --regexp '[Ee][Rr][Rr][Oo][Rr]'
+    refute_output --regexp '[Ww][Aa][Rr][Nn][Ii][Nn][Gg]'
+}
+
+@test "Check that DNS-01 verification works if the domain is not lowercase" {
+    if [ -n "$STAGING" ]; then
+        skip "Using staging server, skipping internal test"
+    fi
+    CONFIG_FILE="getssl-dns01.cfg"
+    GETSSL_CMD_HOST=$(echo $GETSSL_HOST | tr a-z A-Z)
+    setup_environment
+
+    init_getssl
+    create_certificate
+    assert_success
+    refute_output --regexp '[Ff][Aa][Ii][Ll][Ee][Dd]'
+    refute_output --regexp '[Ee][Rr][Rr][Oo][Rr]'
+    refute_output --regexp '[Ww][Aa][Rr][Nn][Ii][Nn][Gg]'
+}
diff --git a/test/7-duckdns-dns01-dig.bats b/test/7-staging-dns01-dig.bats
similarity index 95%
rename from test/7-duckdns-dns01-dig.bats
rename to test/7-staging-dns01-dig.bats
index c6d8f56..8c0d7f1 100644
--- a/test/7-duckdns-dns01-dig.bats
+++ b/test/7-staging-dns01-dig.bats
@@ -10,7 +10,7 @@ load '/getssl/test/test_helper.bash'
     if [ -z "$STAGING" ]; then
         skip "Running internal tests, skipping external test"
     fi
-    CONFIG_FILE="getssl-duckdns01.cfg"
+    CONFIG_FILE="getssl-staging-dns01.cfg"
 
     setup_environment
     init_getssl
diff --git a/test/7-duckdns-dns01-nslookup.bats b/test/7-staging-dns01-nslookup.bats
similarity index 96%
rename from test/7-duckdns-dns01-nslookup.bats
rename to test/7-staging-dns01-nslookup.bats
index 81c921e..027a210 100644
--- a/test/7-duckdns-dns01-nslookup.bats
+++ b/test/7-staging-dns01-nslookup.bats
@@ -24,7 +24,7 @@ teardown() {
     if [ -z "$STAGING" ]; then
         skip "Running internal tests, skipping external test"
     fi
-    CONFIG_FILE="getssl-duckdns01.cfg"
+    CONFIG_FILE="getssl-staging-dns01.cfg"
 
     setup_environment
     init_getssl
diff --git a/test/8-duckdns-ecdsa.bats b/test/8-staging-ecdsa.bats
similarity index 96%
rename from test/8-duckdns-ecdsa.bats
rename to test/8-staging-ecdsa.bats
index 2e10512..92c694a 100644
--- a/test/8-duckdns-ecdsa.bats
+++ b/test/8-staging-ecdsa.bats
@@ -11,7 +11,7 @@ load '/getssl/test/test_helper.bash'
     if [ -z "$STAGING" ]; then
         skip "Running internal tests, skipping external test"
     fi
-    CONFIG_FILE="getssl-duckdns01.cfg"
+    CONFIG_FILE="getssl-staging-dns01.cfg"
 
     setup_environment
     init_getssl
@@ -41,7 +41,7 @@ load '/getssl/test/test_helper.bash'
     if [ -z "$STAGING" ]; then
         skip "Running internal tests, skipping external test"
     fi
-    CONFIG_FILE="getssl-duckdns01.cfg"
+    CONFIG_FILE="getssl-staging-dns01.cfg"
 
     setup_environment
     init_getssl
diff --git a/test/9-test--all.bats b/test/9-test--all.bats
new file mode 100644
index 0000000..94a2c28
--- /dev/null
+++ b/test/9-test--all.bats
@@ -0,0 +1,34 @@
+#! /usr/bin/env bats
+
+load '/bats-support/load.bash'
+load '/bats-assert/load.bash'
+load '/getssl/test/test_helper.bash'
+
+
+# This is run for every test
+setup() {
+    export CURL_CA_BUNDLE=/root/pebble-ca-bundle.crt
+    export PATH=$PATH:/getssl
+}
+
+
+@test "Create new certificate using --all" {
+    if [ -n "$STAGING" ]; then
+        skip "Using staging server, skipping internal test"
+    fi
+
+    # Setup
+    CONFIG_FILE="getssl-http01.cfg"
+    setup_environment
+    init_getssl
+    cp "${CODE_DIR}/test/test-config/${CONFIG_FILE}" "${INSTALL_DIR}/.getssl/${GETSSL_HOST}/getssl.cfg"
+
+    # Run test
+    run ${CODE_DIR}/getssl --all
+
+    # Check success conditions
+    assert_success
+    refute_output --regexp '[Ff][Aa][Ii][Ll][Ee][Dd]'
+    refute_output --regexp '[Ee][Rr][Rr][Oo][Rr]'
+    refute_output --regexp '[Ww][Aa][Rr][Nn][Ii][Nn][Gg]'
+}
diff --git a/test/Dockerfile-centos7-duckdns b/test/Dockerfile-centos7-staging
similarity index 100%
rename from test/Dockerfile-centos7-duckdns
rename to test/Dockerfile-centos7-staging
diff --git a/test/Dockerfile-ubuntu-duckdns b/test/Dockerfile-ubuntu-staging
similarity index 100%
rename from test/Dockerfile-ubuntu-duckdns
rename to test/Dockerfile-ubuntu-staging
diff --git a/test/run-test.cmd b/test/run-test.cmd
index d1cf263..43c4e40 100644
--- a/test/run-test.cmd
+++ b/test/run-test.cmd
@@ -7,8 +7,8 @@ IF %2.==. GOTO NoCmd
 set COMMAND=%2 %3
 
 :CheckAlias
-REM check if OS *contains* duckdns
-IF NOT x%OS:duckdns=%==x%OS% GOTO duckdns
+REM check if OS *contains* staging
+IF NOT x%OS:staging=%==x%OS% GOTO staging
 set ALIAS=%OS%.getssl.test
 set STAGING=
 GOTO Run
@@ -22,8 +22,8 @@ REM set COMMAND=/getssl/test/run-bats.sh
 set COMMAND=bats /getssl/test
 GOTO CheckAlias
 
-:duckdns
-set ALIAS=%OS:-duckdns=%-getssl.duckdns.org
+:staging
+set ALIAS=%OS:-staging=%-getssl.duckdns.org
 set STAGING=--env STAGING=true
 
 :Run
@@ -33,7 +33,7 @@ docker build --rm -f "test\Dockerfile-%OS%" -t getssl-%OS% .
 @echo on
 docker run -it ^
   --env GETSSL_HOST=%ALIAS% %STAGING% ^
-  --env GETSSL_OS=%OS:-duckdns=% ^
+  --env GETSSL_OS=%OS:-staging=% ^
   -v %cd%:/getssl ^
   --rm ^
   --network %CurrDirName%_acmenet ^
diff --git a/test/run-test.sh b/test/run-test.sh
index 97842a5..d99d5a3 100755
--- a/test/run-test.sh
+++ b/test/run-test.sh
@@ -14,8 +14,8 @@ else
     COMMAND="bats /getssl/test"
 fi
 
-if [[ "$OS" == *"duckdns"* ]]; then
-    ALIAS="${OS%-duckdns}-getssl.duckdns.org"
+if [[ "$OS" == *"staging"* ]]; then
+    ALIAS="${OS%-staging}-getssl.duckdns.org"
     STAGING="--env STAGING=true"
 else
     ALIAS="$OS.getssl.test"
@@ -26,7 +26,7 @@ docker build --rm -f "test/Dockerfile-$OS" -t "getssl-$OS" .
 # shellcheck disable=SC2086
 docker run \
   --env GETSSL_HOST=$ALIAS $STAGING \
-  --env GETSSL_OS=${OS%-duckdns} \
+  --env GETSSL_OS=${OS%-staging} \
   -v "$(pwd)":/getssl \
   --rm \
   --network ${PWD##*/}_acmenet \
diff --git a/test/test-config/getssl-duckdns01.cfg b/test/test-config/getssl-staging-dns01.cfg
similarity index 100%
rename from test/test-config/getssl-duckdns01.cfg
rename to test/test-config/getssl-staging-dns01.cfg
diff --git a/test/test_helper.bash b/test/test_helper.bash
index f311b18..f4c62af 100644
--- a/test/test_helper.bash
+++ b/test/test_helper.bash
@@ -21,7 +21,7 @@ cleanup_environment() {
 
 init_getssl() {
     # Run initialisation (create account key, etc)
-    run ${CODE_DIR}/getssl -c "$GETSSL_HOST"
+    run ${CODE_DIR}/getssl -c "$GETSSL_CMD_HOST"
     assert_success
     [ -d "$INSTALL_DIR/.getssl" ]
 }
@@ -29,9 +29,9 @@ init_getssl() {
 
 create_certificate() {
     # Create certificate
-    cp "${CODE_DIR}/test/test-config/${CONFIG_FILE}" "${INSTALL_DIR}/.getssl/${GETSSL_HOST}/getssl.cfg"
+    cp "${CODE_DIR}/test/test-config/${CONFIG_FILE}" "${INSTALL_DIR}/.getssl/${GETSSL_CMD_HOST}/getssl.cfg"
     # shellcheck disable=SC2086
-    run ${CODE_DIR}/getssl $1 "$GETSSL_HOST"
+    run ${CODE_DIR}/getssl $1 "$GETSSL_CMD_HOST"
 }
 
 # start nginx in background on alpine via supervisord
@@ -68,6 +68,9 @@ fi
 
 export GETSSL_IP
 
+GETSSL_CMD_HOST=$GETSSL_HOST
+export GETSSL_CMD_HOST
+
 if [ ! -f ${INSTALL_DIR}/pebble.minica.pem ]; then
     wget --quiet --no-clobber https://raw.githubusercontent.com/letsencrypt/pebble/master/test/certs/pebble.minica.pem 2>&1
     CERT_FILE=/etc/ssl/certs/ca-certificates.crt