diff --git a/bashbot.sh b/bashbot.sh
index f1f69c2..f479fbc 100755
--- a/bashbot.sh
+++ b/bashbot.sh
@@ -26,7 +26,7 @@
 #     8 - curl/wget missing
 #     10 - not bash!
 #
-#### $$VERSION$$ v1.21-pre-6-g23e04a9
+#### $$VERSION$$ v1.21-pre-7-g74dfdd7
 ##################################################################
 # shellcheck disable=SC2140,SC2031,SC2120,SC1091,SC1117,SC2059
 
@@ -235,8 +235,7 @@ if [ -z "${BOTTOKEN}" ]; then
   fi
   # check data dir file
   if [ ! -w "${DATADIR}" ]; then
-	printf "${RED}ERROR: Can't write to ${DATADIR}!.${NN}"
-	ls -ld "${DATADIR}"
+	printf "${RED}ERROR: ${DATADIR} does not exist or is not writeable!.${NN}"
 	exit 2
   fi
   # setup count file 
diff --git a/dev/all-tests.sh b/dev/all-tests.sh
index ae5b970..46f219a 100755
--- a/dev/all-tests.sh
+++ b/dev/all-tests.sh
@@ -5,7 +5,7 @@
 #
 # Description: run all tests, exit after failed test
 #
-#### $$VERSION$$ v1.21-pre-3-gbbbf57c
+#### $$VERSION$$ v1.21-pre-7-g74dfdd7
 #############################################################
 
 # magic to ensure that we're always inside the root of our application,
@@ -27,6 +27,9 @@ cd "test" || exit 1
 # delete possible config
 rm -f "${TESTENV}/botconfig.jssh" "${TESTENV}/botacl" 2>/dev/null
 
+# mkdir needed dirs
+mkdir "${TESTENV}/data-bot-bash"
+
 # inject JSON.sh
 mkdir "${TESTENV}/JSON.sh"
 curl -sL "https://cdn.jsdelivr.net/gh/dominictarr/JSON.sh/JSON.sh" >"${TESTENV}/JSON.sh/JSON.sh"
diff --git a/dev/make-distribution.sh b/dev/make-distribution.sh
index a87d54f..b41a37a 100755
--- a/dev/make-distribution.sh
+++ b/dev/make-distribution.sh
@@ -7,7 +7,7 @@
 #
 # Options: --notest - skip tests
 #
-#### $$VERSION$$ v1.21-pre-3-gbbbf57c
+#### $$VERSION$$ v1.21-pre-7-g74dfdd7
 ##############################################################
 
 # magic to ensure that we're always inside the root of our application,
@@ -25,7 +25,7 @@ VERSION="$(git describe --tags | sed -e 's/-[0-9].*//' -e 's/v//')"
 DISTNAME="telegram-bot-bash"
 DISTDIR="./DIST/${DISTNAME}" 
 DISTFILES="bashbot.rc bashbot.sh commands.sh mycommands.sh mycommands.sh.clean bin doc examples scripts modules addons LICENSE README.md README.txt README.html"
-DISTMKDIR="data-bot-bash logs"
+DISTMKDIR="data-bot-bash logs bin bin/logs"
 
 # run tests first!
 for test in $1 dev/all-test*.sh
@@ -33,7 +33,7 @@ do
    [[ "${test}" == "--notest"* ]] && break
    [ ! -x "${test}" ] && continue
    if ! "${test}" ; then
-	printf "Test %s failed, can't create dist!\n" "${test}"
+	printf "ERROR: Test %s failed, can't create dist!\n" "${test}"
 	exit 1
   fi
 done
diff --git a/test/e-env-test.sh b/test/e-env-test.sh
index 351645b..5549289 100755
--- a/test/e-env-test.sh
+++ b/test/e-env-test.sh
@@ -1,5 +1,5 @@
 #!/usr/bin/env bash
-#### $$VERSION$$ v1.21-dev-10-g9bfc27a
+#### $$VERSION$$ v1.21-pre-7-g74dfdd7
 
 # include common functions and definitions
 # shellcheck source=test/ALL-tests.inc.sh
@@ -37,6 +37,7 @@ TESTFILES="${TOKENFILE} ${ACLFILE}"
 
 
 echo "Check first run in ENVIRONMENT ..."
+mkdir "${BASHBOT_VAR}/${DATADIR}"
 
 # run bashbot first time with init
 "${BASHBOT_BIN}/bashbot.sh" init >"${LOGFILE}"  <<EOF