diff --git a/helper.mk b/helper.mk
index 182e1b1cc..7e88d84df 100755
--- a/helper.mk
+++ b/helper.mk
@@ -342,6 +342,8 @@ zwa_dir?=${zwa_project}
 
 ${CURDIR}/tmp/${zwa_file}:
 	@echo "TODO: https://github.com/Z-Wave-Alliance/z-wave-stack-binaries/issues/2"
+	gh auth status || gh auth login
+	gh auth status || echo "Please download ${zwa_url} to $@"
 	mkdir -p ${@D} && cd ${@D} \
 		&& gh release download \
 			--repo "${zwa_url}" --pattern "${zwa_file}" \
@@ -351,13 +353,13 @@ ${zwa_dir}: ${CURDIR}/tmp/${zwa_file}
 	mkdir -p "$@"
 	tar xfa "$<" -C "$@"
 
-zwa/setup: ${zwa_project}
-	ls ${zwa_project}
+zwa/setup: ${zwa_dir}
+	ls ${<}
 
 mapdir?=applications/zpc/components/dotdot_mapper/rules
 datastore_file?=tmp.db
 cache_path?=tmp/cache/ota
-zwa/test: ./scripts/tests/z-wave-stack-binaries-test.sh ${zwa_dir}
+zwa/test: ./scripts/tests/z-wave-stack-binaries-test.sh
 	-reset
 	rm -fv ${datastore_file} *.tmp
 	mkdir -p ${cache_path}
diff --git a/scripts/tests/z-wave-stack-binaries-test.sh b/scripts/tests/z-wave-stack-binaries-test.sh
index 3738f5ae1..f32d95494 100755
--- a/scripts/tests/z-wave-stack-binaries-test.sh
+++ b/scripts/tests/z-wave-stack-binaries-test.sh
@@ -440,6 +440,8 @@ play_net_add_node_()
     [ $conthomeid = $nodehomeid ] || exit_ 17
     node_cli_ "$node" n # 2 expected on 1st time
     [ $nodeid -ne 0 ] || exit_ 19
+
+    zpc_cli_ zwave_log_security_keys
 }
 
 
@@ -775,7 +777,7 @@ play_()
     until grep -- "\[mqtt_wrapper_mosquitto\]" "${zpc_log}" ; do sleep 1 ; done
     until grep -- "\[mqtt_client\] Connection to MQTT broker" "${zpc_log}" ; do sleep 1 ; done
 
-    log_ "$task: Check presense of controller"
+    log_ "$task: Check presence of controller"
     controller_cli_ h
 
     log_ "$task: Find host"