diff --git a/test/ALL-tests.inc.sh b/test/ALL-tests.inc.sh
index 2431581..f199ce0 100644
--- a/test/ALL-tests.inc.sh
+++ b/test/ALL-tests.inc.sh
@@ -11,7 +11,7 @@
 #	LICENSE: WTFPLv2 http://www.wtfpl.net/txt/copying/
 #        AUTHOR: KayM (gnadelwartz), kay@rrr.de
 #
-#### $$VERSION$$ v1.21-0-gc85af77
+#### $$VERSION$$ v1.25-dev-8-g248a065
 #===============================================================================
 
 # common variables
@@ -61,9 +61,9 @@ print_array() {
   local idx t
   local arrays=( "${@}" )
   for idx in "${arrays[@]}"; do
-    declare -n temp="$idx"
+    declare -n temp="${idx}"
 	for t in "${!temp[@]}"; do 
-  		printf '%s:\t%s\t%s\n' "$idx" "$t" "${temp[$t]}"
+  		printf '%s:\t%s\t%s\n' "${idx}" "${t}" "${temp[${t}]}"
 	done | sort
   done | grep -v '^USER:	0'
 }
@@ -76,7 +76,7 @@ compare_sorted() {
 	diff -c "${1}.sort" "${2}.sort" || ret=1
 	[[ "${1}" != "${TESTDIR}"* ]] && rm -f "${1}.sort"
 	[[ "${2}" != "${TESTDIR}"* ]] && rm -f "${2}.sort"
-	return "$ret"
+	return "${ret}"
 }
 
 ######
diff --git a/test/c-init-test.sh b/test/c-init-test.sh
index 8dd7057..1d6964d 100755
--- a/test/c-init-test.sh
+++ b/test/c-init-test.sh
@@ -10,7 +10,7 @@
 #	LICENSE: WTFPLv2 http://www.wtfpl.net/txt/copying/
 #        AUTHOR: KayM (gnadelwartz), kay@rrr.de
 #
-#### $$VERSION$$ v1.21-0-gc85af77
+#### $$VERSION$$ v1.25-dev-8-g248a065
 #===============================================================================
 
 # include common functions and definitions
@@ -24,7 +24,7 @@ TESTFILES="${TOKENFILE} ${ACLFILE} ${COUNTFILE} ${BLOCKEDFILE} ${ADMINFILE}"
 # run bashbot first time with init
 printf "Run bashbot init ...\n"
 "${TESTDIR}/bashbot.sh" init >"${LOGFILE}"  <<EOF
-$TESTTOKEN
+${TESTTOKEN}
 nobody
 botadmin
 
@@ -46,7 +46,7 @@ trap exit 1 EXIT
 cd "${TESTDIR}" || exit
 
 printf "%s\n" "Test if ${JSONSHFILE} exists ..."
-[ ! -x "$JSONSHFILE" ] && { printf "%s\n" "${NOSUCCESS} json.sh not found"; exit 1; }
+[ ! -x "${JSONSHFILE}" ] && { printf "%s\n" "${NOSUCCESS} json.sh not found"; exit 1; }
 
 printf "Test Sourcing of bashbot.sh ...\n"
 # shellcheck source=./bashbot.sh
diff --git a/test/d-send_message-test.sh b/test/d-send_message-test.sh
index 5a7d131..33bd3de 100755
--- a/test/d-send_message-test.sh
+++ b/test/d-send_message-test.sh
@@ -10,7 +10,7 @@
 #	LICENSE: WTFPLv2 http://www.wtfpl.net/txt/copying/
 #        AUTHOR: KayM (gnadelwartz), kay@rrr.de
 #
-#### $$VERSION$$ v1.21-0-gc85af77
+#### $$VERSION$$ v1.25-dev-8-g248a065
 #===============================================================================
 
 # include common functions and definitions
@@ -51,18 +51,18 @@ printf "  Send line ..."
 
 # create dummy files for upload
 ALLOW='/tmp/allowed'
-FILE_REGEX="$ALLOW/.*"
-[ -d "$ALLOW" ] || mkdir "$ALLOW"
-touch "$ALLOW/this_is_my.gif" "$ALLOW/this_is_my.doc"
-touch "$DATADIR/this_is_my.gif" "$DATADIR/this_is_my.doc"
+FILE_REGEX="${ALLOW}/.*"
+[ -d "${ALLOW}" ] || mkdir "${ALLOW}"
+touch "${ALLOW}/this_is_my.gif" "${ALLOW}/this_is_my.doc"
+touch "${DATADIR}/this_is_my.gif" "${DATADIR}/this_is_my.doc"
 
 while read -r line ; do
 	set -x; set +e
-	send_message "123456" "$line" >>"${OUTPUTFILE}"
+	send_message "123456" "${line}" >>"${OUTPUTFILE}"
 	set +x; set -e
 	printf "."
 done < "${INPUTFILE}" 2>>"${LOGFILE}"
-[ -d "$ALLOW" ] && rm -rf "$ALLOW"
+[ -d "${ALLOW}" ] && rm -rf "${ALLOW}"
 
 printf " done.\n"
 
diff --git a/test/e-env-test.sh b/test/e-env-test.sh
index 17fc8df..01617aa 100755
--- a/test/e-env-test.sh
+++ b/test/e-env-test.sh
@@ -10,7 +10,7 @@
 #	LICENSE: WTFPLv2 http://www.wtfpl.net/txt/copying/
 #        AUTHOR: KayM (gnadelwartz), kay@rrr.de
 #
-#### $$VERSION$$ v1.21-0-gc85af77
+#### $$VERSION$$ v1.25-dev-8-g248a065
 #===============================================================================
 
 # include common functions and definitions
@@ -53,7 +53,7 @@ mkdir "${BASHBOT_VAR}/${DATADIR}"
 
 # run bashbot first time with init
 "${BASHBOT_BIN}/bashbot.sh" init >"${LOGFILE}"  <<EOF
-$TESTTOKEN
+${TESTTOKEN}
 nobody
 botadmin
 EOF