diff --git a/functions.sh b/functions.sh
index 8124ac6..b5171ff 100755
--- a/functions.sh
+++ b/functions.sh
@@ -148,11 +148,11 @@ customStepExec() {
     local template_flavor_dir="$4"
     local template_flavor_prefix="$5"
 
-    [[ -z $TEST ]] && echo "Calling script:  ${calling_script}" || :
-    [[ -z $TEST ]] && echo "Step:            ${step}" || :
-    [[ -z $TEST ]] && echo "Template Flavor: ${template_flavor}" || :
-    [[ -z $TEST ]] && echo "Template Dir:    ${template_flavor_dir}" || :
-    [[ -z $TEST ]] && echo "Template Prefix: ${template_flavor_prefix}" || :
+    [[ -z $TEST ]] && debug "Calling script:  ${calling_script}" || :
+    [[ -z $TEST ]] && debug "Step:            ${step}" || :
+    [[ -z $TEST ]] && debug "Template Flavor: ${template_flavor}" || :
+    [[ -z $TEST ]] && debug "Template Dir:    ${template_flavor_dir}" || :
+    [[ -z $TEST ]] && debug "Template Prefix: ${template_flavor_prefix}" || :
 
     splitPath "${calling_script}" path_parts
 
@@ -216,10 +216,7 @@ customCopy() {
 }
 
 templateFlavor() {
-    local template=${TEMPLATE_FLAVOR}
-    local default="${SCRIPTSDIR}"
-
-    echo ${template:-${default}}
+    echo ${TEMPLATE_FLAVOR}
 }
 
 templateFlavorPrefix() {
@@ -245,7 +242,7 @@ templateFlavorDir() {
         fi
     done
 
-    echo "${SCRIPTDIR}"
+    echo "${SCRIPTSDIR}"
 }
 
 customParse() {
diff --git a/tests/template-flavors/test.sh b/tests/template-flavors/test.sh
index eb8b5e1..f7365a7 100755
--- a/tests/template-flavors/test.sh
+++ b/tests/template-flavors/test.sh
@@ -47,7 +47,7 @@ assertEnd() {
 }
 
 # Defaults
-export SCRIPTDIR="tests/template-flavors"
+export SCRIPTSDIR="tests/template-flavors"
 export DIST="wheezy"
 export TEMPLATE_FLAVOR="whonix-gateway"
 
@@ -56,7 +56,7 @@ export TEMPLATE_FLAVOR_PREFIX=""
 
 # Just use error to show text in red
 head "=== Globals ==="
-debug 'export SCRIPTDIR="tests/template-flavors"'
+debug 'export SCRIPTSDIR="tests/template-flavors"'
 debug 'export DIST="wheezy"'
 debug 'export TEMPLATE_FLAVOR="whonix-gateway"'
 debug 'export TEMPLATE_FLAVOR_PREFIX=""'
@@ -147,7 +147,7 @@ assertTest "customStep $0 pre" "tests/template-flavors/wheezy+whonix-gateway/tes
 assertEnd "Test 7"
 
 # ------------------------------------------------------------------------------
-export INSTALLDIR="${SCRIPTDIR}/test_copy_location"
+export INSTALLDIR="${SCRIPTSDIR}/test_copy_location"
 head " 8. Copy files
     \n    Just test copying from here to ${INSTALLDIR}"
 TEMPLATE_FLAVOR_DIR=""