diff --git "a/\173\173cookiecutter.service_name\175\175/tests/run_tests.sh" "b/\173\173cookiecutter.service_name\175\175/tests/run_tests.sh"
index 7efaa02..80b2da9 100755
--- "a/\173\173cookiecutter.service_name\175\175/tests/run_tests.sh"
+++ "b/\173\173cookiecutter.service_name\175\175/tests/run_tests.sh"
@@ -46,10 +46,10 @@
     dependency_check virtualenv
     virtualenv $VENV_DIR
     source ${VENV_DIR}/bin/activate
-    pip install salt${PIP_SALT_VERSION}
-    pip install jsonschema
+    python -m pip install salt${PIP_SALT_VERSION}
+    python -m pip install jsonschema
     if [[ -f ${CURDIR}/pip_requirements.txt ]]; then
-       pip install -r ${CURDIR}/pip_requirements.txt
+       python -m pip install -r ${CURDIR}/pip_requirements.txt
     fi
 }
 
@@ -151,7 +151,7 @@
 
 salt_run() {
     [ -e ${VENV_DIR}/bin/activate ] && source ${VENV_DIR}/bin/activate
-    salt-call ${SALT_OPTS} $*
+    python $(which salt-call) ${SALT_OPTS} $*
 }
 
 prepare() {
@@ -167,7 +167,7 @@
 lint_releasenotes() {
     [[ ! -f "${VENV_DIR}/bin/activate" ]] && setup_virtualenv
     source ${VENV_DIR}/bin/activate
-    pip install reno
+    python -m pip install reno
     reno lint ${CURDIR}/../
 }
 
@@ -209,7 +209,7 @@
       fetch_dependency "salt:https://github.com/salt-formulas/salt-formula-salt"
       link_modules
       # Rendered Example:
-      # salt-call --local -c /test1/maas/tests/build/salt --id=maas_cluster modelschema.model_validate maas cluster
+      # python $(which salt-call) --local -c /test1/maas/tests/build/salt --id=maas_cluster modelschema.model_validate maas cluster
       for role in ${SCHEMARDIR}/*.yaml; do
           state_name=$(basename "${role%*.yaml}")
           minion_id="${state_name}"
diff --git "a/\173\173cookiecutter.service_name\175\175/\173\173cookiecutter.service_name\175\175/\173\173cookiecutter.role_name\175\175.sls" "b/\173\173cookiecutter.service_name\175\175/\173\173cookiecutter.service_name\175\175/\173\173cookiecutter.role_name\175\175.sls"
deleted file mode 100644
index 3fcdea5..0000000
--- "a/\173\173cookiecutter.service_name\175\175/\173\173cookiecutter.service_name\175\175/\173\173cookiecutter.role_name\175\175.sls"
+++ /dev/null
@@ -1,4 +0,0 @@
-{{ '{%-' }} from "{{cookiecutter.service_name}}/map.jinja" import {{cookiecutter.role_name}} with context {{ '%}' }}
-{{ '{%-' }} if {{cookiecutter.role_name}}.enabled {{ '%}' }}
-
-{{ '{%-' }} endif {{ '%}' }}