diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
index 961a3f53..541b4abc 100644
--- a/.github/workflows/ci.yml
+++ b/.github/workflows/ci.yml
@@ -110,6 +110,7 @@ jobs:
     - name: Provision test environment
       run: |
         bundle exec rake "litmus:provision[${{matrix.platforms.provider}},${{ matrix.platforms.image }}]"
+        cat spec/fixtures/litmus_inventory.yaml
 
     - name: Install agent
       run: |
@@ -152,8 +153,3 @@ jobs:
       run: |
         bundle exec rake 'litmus:acceptance:parallel'
 
-    - name: Remove test environment
-      if: ${{ always() }}
-      continue-on-error: true
-      run: |
-        bundle exec rake 'litmus:tear_down'
diff --git a/templates/create/login/permission.sql.epp b/templates/create/login/permission.sql.epp
index f2f3feb6..0a8dddf0 100644
--- a/templates/create/login/permission.sql.epp
+++ b/templates/create/login/permission.sql.epp
@@ -1,7 +1,9 @@
 USE [master];
+
 DECLARE @perm_state varchar(250), @error_msg varchar(250), @permission varchar(250);
-<% $permissions.each |$requested_permission| { %>
-    <% $permission = $requested_permission.upcase %>
+<% $permissions.each |$requested_permission| { -%>
+    <% $permission = $requested_permission.upcase -%>
+SET @permission = '<%= $permission %>'
 BEGIN
     <% if $with_grant_option == false { %>
     IF 'GRANT_WITH_GRANT_OPTION' = <%= epp('sqlserver/snippets/login/get_perm_state.sql.epp', { 'login' => $login }) %>
diff --git a/templates/create/role/permissions.sql.epp b/templates/create/role/permissions.sql.epp
index 77f0b15e..71baec93 100644
--- a/templates/create/role/permissions.sql.epp
+++ b/templates/create/role/permissions.sql.epp
@@ -1,10 +1,10 @@
 USE [<%= $database %>];
 <%= epp('sqlserver/snippets/role/declare_and_set_variables.sql.epp', $role_declare_and_set_variables_parameters) -%>
 
-<% $permissions.each |$requested_permission| { %>
-    <% $permission = $requested_permission.upcase %>
+<% $permissions.each |$requested_permission| { -%>
+    <% $permission = $requested_permission.upcase -%>
 SET @permission = '<%= $permission %>';
-<% if $with_grant_option == false { %>
+<% if $with_grant_option == false { -%>
     IF 'GRANT_WITH_GRANT_OPTION' = <%= epp('sqlserver/snippets/principal/permission/get_perm_state.sql.epp', { 'type' => $type }) -%>
     BEGIN
         REVOKE GRANT OPTION FOR <%= $permission %> TO [<%= $role %>] CASCADE;
diff --git a/templates/create/user/permission.sql.epp b/templates/create/user/permission.sql.epp
index d097e276..f73a3036 100644
--- a/templates/create/user/permission.sql.epp
+++ b/templates/create/user/permission.sql.epp
@@ -1,13 +1,13 @@
 USE [<%= $database %>];
 DECLARE @perm_state varchar(250), @error_msg varchar(250), @permission varchar(250);
-<% $permissions.each |$requested_permission| { %>
-    <% $permission = $requested_permission.upcase %>
+<% $permissions.each |$requested_permission| { -%>
+    <% $permission = $requested_permission.upcase -%>
 SET @permission = '<%= $permission %>';
 BEGIN
-    <% if $with_grant_option == false { %>
+    <% if $with_grant_option == false { -%>
     IF 'GRANT_WITH_GRANT_OPTION' = <%= epp('sqlserver/snippets/user/permission/get_perm_state.sql.epp', { 'user' => $user }) %>
         REVOKE GRANT OPTION FOR <%= $permission %> TO [<%= $user %>] CASCADE;
-    <% } %>
+    <% } -%>
     <%= $_state %> <%= $permission %> TO [<%= $user %>]<% if $with_grant_option == true { %> WITH GRANT OPTION<% } %>;
 END
 BEGIN
diff --git a/templates/query/login/permission_exists.sql.epp b/templates/query/login/permission_exists.sql.epp
index b67d7047..8b74496e 100644
--- a/templates/query/login/permission_exists.sql.epp
+++ b/templates/query/login/permission_exists.sql.epp
@@ -1,7 +1,7 @@
 USE [master];
 DECLARE @perm_state varchar(250), @error_msg varchar(250), @permission varchar(250);
 <% $permissions.each |$requested_permission| { -%>
-    <% $permission = $requested_permission.upcase %>
+    <% $permission = $requested_permission.upcase -%>
 SET @permission = '<%= $permission %>'
 <%= epp('sqlserver/snippets/login/permission/exists.sql.epp', $login_permission_exists_parameters) %>
 <% } %>
diff --git a/templates/query/role/permission_exists.sql.epp b/templates/query/role/permission_exists.sql.epp
index 18270a1d..0f0f48e7 100644
--- a/templates/query/role/permission_exists.sql.epp
+++ b/templates/query/role/permission_exists.sql.epp
@@ -1,8 +1,8 @@
 USE [<%= $database %>];
 <%= epp('sqlserver/snippets/role/declare_and_set_variables.sql.epp', $role_declare_and_set_variables_parameters) -%>
 
-<% $permissions.each |$requested_permission| { %>
-    <% $permission = $requested_permission.upcase %>
+<% $permissions.each |$requested_permission| { -%>
+    <% $permission = $requested_permission.upcase -%>
 SET @permission = '<%= $permission %>';
 <%= epp('sqlserver/snippets/principal/permission/exists.sql.epp', { 'type' => $type }) -%>
 <% } %>