diff --git a/appveyor-linux-binary.yml b/appveyor-linux-binary.yml
index f7afbe0ee8..b745c16d6b 100644
--- a/appveyor-linux-binary.yml
+++ b/appveyor-linux-binary.yml
@@ -72,11 +72,11 @@ install:
   - sh: "PATH=$PATH:$HOME/venv3.7/bin:$HOME/venv3.8/bin:$HOME/venv3.9/bin:$HOME/venv3.10/bin"
 
   # Install pytest
-  - sh: "python3.9 -m venv pytest"
-  - sh: "./pytest/bin/python3 -m pip install -r requirements/pre-dev.txt"
-  - sh: "./pytest/bin/python3 -m pip install -r requirements/dev.txt"
-  - sh: "./pytest/bin/python3 -m pip install -r requirements/base.txt"
-  - sh: "PATH=$(echo $PWD'/pytest/bin'):$PATH"
+  - sh: "python3.9 -m venv $HOME/pytest"
+  - sh: "$HOME/pytest/bin/python3 -m pip install -r requirements/pre-dev.txt"
+  - sh: "$HOME/pytest/bin/python3 -m pip install -r requirements/dev.txt"
+  - sh: "$HOME/pytest/bin/python3 -m pip install -r requirements/base.txt"
+  - sh: "PATH=$HOME/pytest/bin:$PATH"
   - sh: "pytest --version"
 
   # update ca-certificates which causes failures with newest golang library
diff --git a/samcli/lib/init/templates/cookiecutter-aws-sam-hello-python/{{cookiecutter.project_name}}/tests/unit/test_handler.py b/samcli/lib/init/templates/cookiecutter-aws-sam-hello-python/{{cookiecutter.project_name}}/tests/unit/test_handler.py
index 8db12e2ce8..8a90326afd 100644
--- a/samcli/lib/init/templates/cookiecutter-aws-sam-hello-python/{{cookiecutter.project_name}}/tests/unit/test_handler.py
+++ b/samcli/lib/init/templates/cookiecutter-aws-sam-hello-python/{{cookiecutter.project_name}}/tests/unit/test_handler.py
@@ -1,8 +1,7 @@
 import json
 
-from hello_world import app
-
 import pytest
+from hello_world import app
 
 
 @pytest.fixture()
diff --git a/samcli/runtime_config.json b/samcli/runtime_config.json
index 80d15c5f88..556fece612 100644
--- a/samcli/runtime_config.json
+++ b/samcli/runtime_config.json
@@ -1,3 +1,3 @@
 {
-    "app_template_repo_commit": "feec3599fa3272788d3e5a5fe3eb9256d3fd7caa"
+    "app_template_repo_commit": "590b5e90d681c504213e6c35d56c0d63d9401c0b"
 }
diff --git a/tests/regression/package/regression_package_base.py b/tests/regression/package/regression_package_base.py
index eece11503e..744ac55717 100644
--- a/tests/regression/package/regression_package_base.py
+++ b/tests/regression/package/regression_package_base.py
@@ -10,6 +10,7 @@
 import boto3
 
 from samcli.yamlhelper import yaml_parse
+from tests.testing_utils import get_sam_command
 
 S3_SLEEP = 3
 TIMEOUT = 300
@@ -40,8 +41,8 @@ def tearDownClass(cls):
 
     def base_command(self, base):
         command = [base]
-        if os.getenv("SAM_CLI_DEV") and base == "sam":
-            command = ["samdev"]
+        if base == "sam":
+            command = [get_sam_command()]
         elif base == "aws":
             command = [base, "cloudformation"]