diff --git a/lib/tests.sh b/lib/tests.sh
index f38cc97..4e62d8a 100644
--- a/lib/tests.sh
+++ b/lib/tests.sh
@@ -84,7 +84,7 @@ _INSTALL_APP () {
 _LOAD_SNAPSHOT_OR_INSTALL_APP () {
 
     local check_path="$1"
-    local _install_type=$(path_to_install_type $check_path)
+    local _install_type="$(path_to_install_type $check_path)"
     local snapname="snap_${_install_type}install"
 
     if ! LXC_SNAPSHOT_EXISTS $snapname
diff --git a/lib/tests_coordination.sh b/lib/tests_coordination.sh
index b935a4f..795e5af 100644
--- a/lib/tests_coordination.sh
+++ b/lib/tests_coordination.sh
@@ -397,9 +397,8 @@ default_install_path() {
 path_to_install_type() {
     local check_path="$1"
 
-    [ -z "$check_path" ] && echo "nourl" \
-    || [ "$check_path" == "/" ] && echo "root" \
-    || echo "subdir"
-
+    [ -z "$check_path" ] && { echo "nourl"; return; }
+    [ "$check_path" == "/" ] && { echo "root"; return; }
+    echo "subdir"
 }