diff --git a/test/themes/base.theme.git.bats b/test/themes/base.theme.git.bats
index f353316987..c6d63100fa 100644
--- a/test/themes/base.theme.git.bats
+++ b/test/themes/base.theme.git.bats
@@ -1,8 +1,10 @@
 # shellcheck shell=bats
+# shellcheck disable=SC2034
 
 load "${MAIN_BASH_IT_DIR?}/test/test_helper.bash"
 
 function local_setup() {
+  setup_libs
   load "${BASH_IT?}/themes/colors.theme.bash"
   load "${BASH_IT?}/themes/base.theme.bash"
   load "${BASH_IT?}/themes/githelpers.theme.bash"
@@ -18,12 +20,12 @@ add_commit() {
 
 enter_new_git_repo() {
   repo="$(setup_repo)"
-  pushd "${repo}"
+  pushd "${repo}" || return
 }
 
 setup_repo() {
   upstream="$(mktemp -d)"
-  pushd "$upstream" > /dev/null
+  pushd "$upstream" > /dev/null || return
   git init . > /dev/null
 
   echo "$upstream"
@@ -31,83 +33,83 @@ setup_repo() {
 
 setup_repo_with_upstream() {
   upstream="$(setup_repo)"
-  pushd "$upstream" > /dev/null
+  pushd "$upstream" > /dev/null || return
   add_commit > /dev/null
   git checkout -b branch-two
   git checkout -b gone-branch
   git checkout master
-  popd > /dev/null
+  popd > /dev/null || return
 
   downstream="$(setup_repo)"
-  pushd "$downstream" > /dev/null
+  pushd "$downstream" > /dev/null || return
   add_commit > /dev/null
   git remote add my-remote "$upstream"
   git fetch my-remote
   git branch -u my-remote/master > /dev/null
-  popd > /dev/null
+  popd > /dev/null || return
 
-  pushd "$upstream" > /dev/null
+  pushd "$upstream" > /dev/null || return
   git branch -d gone-branch > /dev/null
-  popd > /dev/null
+  popd > /dev/null || return
 
-  pushd "$downstream" > /dev/null
+  pushd "$downstream" > /dev/null || return
   git fetch my-remote
-  popd > /dev/null
+  popd > /dev/null || return
 
   echo "$downstream"
 }
 
 @test 'themes base: Git: when tracking a remote branch: it shows the commits ahead and behind' {
-  pre="\$(_git-friendly-ref)"
+  pre='$(_git-friendly-ref)'
 
   remote="$(setup_repo)"
-  pushd "$remote"
+  pushd "$remote" || return
   add_commit
   add_commit
-  popd
+  popd || return
 
   clone="$(mktemp -d)"
-  pushd "$clone"
+  pushd "$clone" || return
   git clone "$remote" clone
   cd clone
 
   SCM_GIT_SHOW_COMMIT_COUNT=true
 
   git_prompt_vars
-  assert_equal "$SCM_BRANCH" "${pre}"
+  assert_equal "${SCM_BRANCH?}" "${pre}"
 
   add_commit
 
   git_prompt_vars
-  assert_equal "$SCM_BRANCH" "${pre} ↑1"
+  assert_equal "${SCM_BRANCH?}" "${pre} ↑1"
 
   add_commit
 
   git_prompt_vars
-  assert_equal "$SCM_BRANCH" "${pre} ↑2"
-  popd
+  assert_equal "${SCM_BRANCH?}" "${pre} ↑2"
+  popd || return
 
-  pushd "$remote"
+  pushd "$remote" || return
   add_commit
   add_commit
   add_commit
-  popd
+  popd || return
 
-  pushd "$clone/clone"
+  pushd "$clone/clone" || return
   git fetch
 
   git_prompt_vars
-  assert_equal "$SCM_BRANCH" "${pre} ↑2 ↓3"
+  assert_equal "${SCM_BRANCH?}" "${pre} ↑2 ↓3"
 
   git reset HEAD~2 --hard
 
   SCM_GIT_BEHIND_CHAR="↓"
   git_prompt_vars
-  assert_equal "$SCM_BRANCH" "${pre} ↓3"
+  assert_equal "${SCM_BRANCH?}" "${pre} ↓3"
 }
 
 @test 'themes base: Git: when stashes exist: it shows the number of stashes' {
-  pre="\$(_git-friendly-ref)"
+  pre='$(_git-friendly-ref)'
 
   enter_new_git_repo
   add_commit
@@ -119,90 +121,90 @@ setup_repo_with_upstream() {
   SCM_GIT_SHOW_STASH_INFO=true
 
   git_prompt_vars
-  assert_equal "$SCM_BRANCH" "${pre} {1}"
+  assert_equal "${SCM_BRANCH?}" "${pre} {1}"
 
   touch file2
   git add file2
   git stash
 
   git_prompt_vars
-  assert_equal "$SCM_BRANCH" "${pre} {2}"
+  assert_equal "${SCM_BRANCH?}" "${pre} {2}"
 }
 
 @test 'themes base: Git: remote info: when there is no upstream remote: is empty' {
-  pre="\$(_git-friendly-ref)"
+  pre='$(_git-friendly-ref)'
   post=" ↑1 ↓1"
 
   enter_new_git_repo
   add_commit
 
   git_prompt_vars
-  assert_equal "$SCM_BRANCH" "${pre}"
+  assert_equal "${SCM_BRANCH?}" "${pre}"
 }
 
 @test 'themes base: Git: remote info: when SCM_GIT_SHOW_REMOTE_INFO is true: includes the remote' {
-  pre="\$(_git-friendly-ref) → "
+  pre='$(_git-friendly-ref) → '
   eval_pre="master → "
   post=" ↑1 ↓1"
 
   repo="$(setup_repo_with_upstream)"
-  pushd "${repo}"
+  pushd "${repo}" || return
 
   SCM_GIT_SHOW_REMOTE_INFO=true
   SCM_GIT_SHOW_COMMIT_COUNT=true
 
   git_prompt_vars
-  assert_equal "$SCM_BRANCH" "${pre}my-remote${post}"
+  assert_equal "${SCM_BRANCH?}" "${pre}my-remote${post}"
 
   git branch -u my-remote/branch-two
 
   git_prompt_vars
-  assert_equal "$SCM_BRANCH" "${pre}\$(_git-upstream)${post}"
-  assert_equal "$(eval "echo \"$SCM_BRANCH\"")" "${eval_pre}my-remote/branch-two${post}"
+  assert_equal "${SCM_BRANCH?}" "${pre}"'$(_git-upstream)'"${post}"
+  assert_equal "$(eval "echo '${SCM_BRANCH?}'")" "${eval_pre}my-remote/branch-two${post}"
 }
 
 @test 'themes base: Git: remote info: when SCM_GIT_SHOW_REMOTE_INFO is auto: includes the remote when more than one remote' {
-  pre="\$(_git-friendly-ref)"
+  pre='$(_git-friendly-ref)'
   eval_pre="master"
   post=" ↑1 ↓1"
 
   repo="$(setup_repo_with_upstream)"
-  pushd "${repo}"
+  pushd "${repo}" || return
 
   SCM_GIT_SHOW_REMOTE_INFO=auto
   SCM_GIT_SHOW_COMMIT_COUNT=true
 
   git_prompt_vars
-  assert_equal "$SCM_BRANCH" "${pre}${post}"
+  assert_equal "${SCM_BRANCH?}" "${pre}${post}"
 
   pre="${pre} → "
   eval_pre="${eval_pre} → "
   git branch -u my-remote/branch-two
 
   git_prompt_vars
-  assert_equal "$SCM_BRANCH" "${pre}\$(_git-upstream-branch)${post}"
-  assert_equal "$(eval "echo \"$SCM_BRANCH\"")" "${eval_pre}branch-two${post}"
+  assert_equal "${SCM_BRANCH?}" "${pre}"'$(_git-upstream-branch)'"${post}"
+  assert_equal "$(eval "echo '${SCM_BRANCH?}'")" "${eval_pre}branch-two${post}"
 
   git remote add second-remote "$(mktemp -d)"
   git branch -u my-remote/master
 
   git_prompt_vars
-  assert_equal "$SCM_BRANCH" "${pre}my-remote${post}"
+  assert_equal "${SCM_BRANCH?}" "${pre}my-remote${post}"
 
   git branch -u my-remote/branch-two
 
   git_prompt_vars
-  assert_equal "$SCM_BRANCH" "${pre}\$(_git-upstream)${post}"
-  assert_equal "$(eval "echo \"$SCM_BRANCH\"")" "${eval_pre}my-remote/branch-two${post}"
+  assert_equal "${SCM_BRANCH?}" "${pre}"'$(_git-upstream)'"${post}"
+  assert_equal "$(eval "echo '${SCM_BRANCH?}'")" "${eval_pre}my-remote/branch-two${post}"
 }
 
 @test 'themes base: Git: remote info: when SCM_GIT_SHOW_REMOTE_INFO is false: never include the remote' {
-  pre="\$(_git-friendly-ref)"
+  pre='$(_git-friendly-ref)'
   eval_pre="master"
   post=" ↑1 ↓1"
 
   repo="$(setup_repo_with_upstream)"
-  pushd "${repo}"
+  pushd "${repo}" || return
   git remote add second-remote "$(mktemp -d)"
   git remote add third-remote "$(mktemp -d)"
 
@@ -210,59 +212,59 @@ setup_repo_with_upstream() {
   SCM_GIT_SHOW_COMMIT_COUNT=true
 
   git_prompt_vars
-  assert_equal "$SCM_BRANCH" "${pre}${post}"
+  assert_equal "${SCM_BRANCH?}" "${pre}${post}"
 
   pre="${pre} → "
   eval_pre="${eval_pre} → "
   git branch -u my-remote/branch-two
 
   git_prompt_vars
-  assert_equal "$SCM_BRANCH" "${pre}\$(_git-upstream-branch)${post}"
-  assert_equal "$(eval "echo \"$SCM_BRANCH\"")" "${eval_pre}branch-two${post}"
+  assert_equal "${SCM_BRANCH?}" "${pre}"'$(_git-upstream-branch)'"${post}"
+  assert_equal "$(eval "echo '${SCM_BRANCH?}'")" "${eval_pre}branch-two${post}"
 }
 
 @test 'themes base: Git: remote info: when showing remote info: show if upstream branch is gone' {
-  pre="\$(_git-friendly-ref)"
+  pre='$(_git-friendly-ref)'
   post=" ↑1 ↓1"
 
   repo="$(setup_repo_with_upstream)"
-  pushd "${repo}"
+  pushd "${repo}" || return
 
   SCM_GIT_SHOW_REMOTE_INFO=true
   SCM_GIT_SHOW_COMMIT_COUNT=true
 
   git_prompt_vars
-  assert_equal "$SCM_BRANCH" "${pre} → my-remote${post}"
+  assert_equal "${SCM_BRANCH?}" "${pre} → my-remote${post}"
 
   git checkout gone-branch
   git fetch --prune --all
 
   git_prompt_vars
-  assert_equal "$SCM_BRANCH" "${pre} ⇢ my-remote"
+  assert_equal "${SCM_BRANCH?}" "${pre} ⇢ my-remote"
 }
 
 @test 'themes base: Git: git friendly ref: when a branch is checked out: shows that branch' {
   enter_new_git_repo
 
   git_prompt_vars
-  assert_equal "$(eval "echo \"$SCM_BRANCH\"")" "master"
+  assert_equal "$(eval "echo '${SCM_BRANCH?}'")" "master"
 
   git checkout -b second-branch
 
   git_prompt_vars
-  assert_equal "$(eval "echo \"$SCM_BRANCH\"")" "second-branch"
+  assert_equal "$(eval "echo '${SCM_BRANCH?}'")" "second-branch"
 }
 
 @test 'themes base: Git: git friendly ref: when a branch is not checked out: shows that branch' {
   enter_new_git_repo
 
   git_prompt_vars
-  assert_equal "$(eval "echo \"$SCM_BRANCH\"")" "master"
+  assert_equal "$(eval "echo '${SCM_BRANCH?}'")" "master"
 
   git checkout -b second-branch
 
   git_prompt_vars
-  assert_equal "$(eval "echo \"$SCM_BRANCH\"")" "second-branch"
+  assert_equal "$(eval "echo '${SCM_BRANCH?}'")" "second-branch"
 }
 
 @test 'themes base: Git: git friendly ref: when detached: commit has branch and tag: show a tag' {
@@ -274,7 +276,7 @@ setup_repo_with_upstream() {
   git checkout HEAD~1
 
   git_prompt_vars
-  assert_equal "$(eval "echo \"$SCM_BRANCH\"")" "tag:first-tag"
+  assert_equal "$(eval "echo '${SCM_BRANCH?}'")" "tag:first-tag"
 }
 
 @test 'themes base: Git: git friendly ref: when detached: commit has branch and no tag: show a branch' {
@@ -285,7 +287,7 @@ setup_repo_with_upstream() {
   git checkout HEAD~1
 
   git_prompt_vars
-  assert_equal "$(eval "echo \"$SCM_BRANCH\"")" "detached:master"
+  assert_equal "$(eval "echo '${SCM_BRANCH?}'")" "detached:master"
 }
 
 @test 'themes base: Git: git friendly ref: when detached with no branch or tag: commit is parent to a named ref: show relative name' {
@@ -295,7 +297,7 @@ setup_repo_with_upstream() {
   git checkout HEAD~1
 
   git_prompt_vars
-  assert_equal "$(eval "echo \"$SCM_BRANCH\"")" "detached:master~1"
+  assert_equal "$(eval "echo '${SCM_BRANCH?}'")" "detached:master~1"
 }
 
 @test 'themes base: Git: git friendly ref: when detached with no branch or tag: commit is not parent to a named ref: show short sha' {
@@ -307,11 +309,11 @@ setup_repo_with_upstream() {
   git checkout "$sha"
 
   git_prompt_vars
-  assert_equal "$(eval "echo \"$SCM_BRANCH\"")" "detached:$sha"
+  assert_equal "$(eval "echo '${SCM_BRANCH?}'")" "detached:$sha"
 }
 
 @test 'themes base: Git: git friendly ref: shows staged, unstaged, and untracked file counts' {
-  pre="\$(_git-friendly-ref)"
+  pre='$(_git-friendly-ref)'
 
   enter_new_git_repo
   echo "line1" > file1
@@ -322,7 +324,7 @@ setup_repo_with_upstream() {
   git commit -m"commit1"
 
   git_prompt_vars
-  assert_equal "$SCM_STATE" " ✓"
+  assert_equal "${SCM_STATE?}" " ✓"
 
   echo "line2" >> file1
   git add file1
@@ -330,56 +332,56 @@ setup_repo_with_upstream() {
   SCM_GIT_SHOW_DETAILS=true
 
   git_prompt_vars
-  assert_equal "$SCM_BRANCH" "${pre} S:1"
-  assert_equal "$SCM_STATE" " ✗"
-  assert_equal "$SCM_DIRTY" "3"
+  assert_equal "${SCM_BRANCH?}" "${pre} S:1"
+  assert_equal "${SCM_STATE?}" " ✗"
+  assert_equal "${SCM_DIRTY?}" "3"
 
   echo "line2" >> file2
   echo "line2" >> file3
   echo "line2" >> file4
 
   git_prompt_vars
-  assert_equal "$SCM_BRANCH" "${pre} S:1 U:3"
-  assert_equal "$SCM_DIRTY" "2"
+  assert_equal "${SCM_BRANCH?}" "${pre} S:1 U:3"
+  assert_equal "${SCM_DIRTY?}" "2"
 
   echo "line1" > newfile5
   echo "line1" > newfile6
 
   git_prompt_vars
-  assert_equal "$SCM_BRANCH" "${pre} S:1 U:3 ?:2"
-  assert_equal "$SCM_DIRTY" "1"
+  assert_equal "${SCM_BRANCH?}" "${pre} S:1 U:3 ?:2"
+  assert_equal "${SCM_DIRTY?}" "1"
 
   git config bash-it.hide-status 1
 
   SCM_DIRTY='nope'
   git_prompt_vars
-  assert_equal "$SCM_BRANCH" "${pre}"
-  assert_equal "$SCM_DIRTY" "nope"
+  assert_equal "${SCM_BRANCH?}" "${pre}"
+  assert_equal "${SCM_DIRTY?}" "nope"
 }
 
 @test 'themes base: Git: git user info: shows user initials' {
-  pre="\$(_git-friendly-ref)"
+  pre='$(_git-friendly-ref)'
 
   enter_new_git_repo
   git config user.name "Cool User"
 
   git_prompt_vars
-  assert_equal "$SCM_BRANCH" "${pre}"
+  assert_equal "${SCM_BRANCH?}" "${pre}"
 
   SCM_GIT_SHOW_CURRENT_USER=true
 
   git_prompt_vars
-  assert_equal "$SCM_BRANCH" "${pre} ☺︎ cu"
+  assert_equal "${SCM_BRANCH?}" "${pre} ☺︎ cu"
 
   git config user.name "Çool Üser"
 
   git_prompt_vars
-  assert_equal "$SCM_BRANCH" "${pre} ☺︎ çü"
+  assert_equal "${SCM_BRANCH?}" "${pre} ☺︎ çü"
 
   # show initials set by `git pair`
 
   git config user.initials "ab cd"
 
   git_prompt_vars
-  assert_equal "$SCM_BRANCH" "${pre} ☺︎ ab+cd"
+  assert_equal "${SCM_BRANCH?}" "${pre} ☺︎ ab+cd"
 }
diff --git a/test/themes/base.theme.svn.bats b/test/themes/base.theme.svn.bats
index 7c91d08a1f..0205fafdd6 100644
--- a/test/themes/base.theme.svn.bats
+++ b/test/themes/base.theme.svn.bats
@@ -9,7 +9,7 @@ function local_setup() {
 
 function setup_repo {
   upstream="$(mktemp -d)"
-  pushd "$upstream" > /dev/null
+  pushd "$upstream" > /dev/null || return
   # Create a dummy SVN folder - this will not work with an actual `svn` command,
   # but will be enough to trigger the SVN check in the base theme.
   mkdir .svn
@@ -29,7 +29,7 @@ function setup_svn_path {
 
 @test 'themes base: SVN: detect SVN repo' {
   repo="$(setup_repo)"
-  pushd "$repo"
+  pushd "$repo" || return
 
   setup_svn_path "$BASH_IT/test/fixtures/svn/working"
 
@@ -38,15 +38,15 @@ function setup_svn_path {
 
   scm
   # Make sure that the SVN command is used
-  assert_equal "$SCM" "$SCM_SVN"
+  assert_equal "${SCM?}" "${SCM_SVN?}"
 }
 
 @test 'themes base: SVN: detect SVN repo even from a subfolder' {
   repo="$(setup_repo)"
-  pushd "$repo"
+  pushd "$repo" || return
 
   mkdir foo
-  pushd foo
+  pushd foo || return
 
   setup_svn_path "$BASH_IT/test/fixtures/svn/working"
 
@@ -55,12 +55,12 @@ function setup_svn_path {
 
   scm
   # Make sure that the SVN command is used
-  assert_equal "$SCM" "$SCM_SVN"
+  assert_equal "${SCM?}" "${SCM_SVN?}"
 }
 
 @test 'themes base: SVN: no SCM if no .svn folder can be found' {
   repo="$(setup_repo)"
-  pushd "$repo"
+  pushd "$repo" || return
 
   rm -rf .svn
 
@@ -71,12 +71,12 @@ function setup_svn_path {
 
   scm
   # Make sure that no SVN command is used
-  assert_equal "$SCM" "$SCM_NONE"
+  assert_equal "${SCM?}" "${SCM_NONE?}"
 }
 
 @test 'themes base: SVN: ignore SVN repo when using broken SVN command' {
   repo="$(setup_repo)"
-  pushd "$repo"
+  pushd "$repo" || return
 
   setup_svn_path "$BASH_IT/test/fixtures/svn/broken"
 
@@ -85,15 +85,15 @@ function setup_svn_path {
 
   scm
   # Make sure that no SVN command is not used
-  assert_equal "$SCM" "$SCM_NONE"
+  assert_equal "${SCM?}" "${SCM_NONE?}"
 }
 
 @test 'themes base: SVN: ignore SVN repo even from a subfolder when using a broken SVN' {
   repo="$(setup_repo)"
-  pushd "$repo"
+  pushd "$repo" || return
 
   mkdir foo
-  pushd foo
+  pushd foo || return
 
   setup_svn_path "$BASH_IT/test/fixtures/svn/broken"
 
@@ -102,5 +102,5 @@ function setup_svn_path {
 
   scm
   # Make sure that no SVN command is used
-  assert_equal "$SCM" "$SCM_NONE"
+  assert_equal "${SCM?}" "${SCM_NONE?}"
 }