diff --git a/Gemfile b/Gemfile
index 4bc7150..60f2000 100644
--- a/Gemfile
+++ b/Gemfile
@@ -17,7 +17,7 @@ ruby_version_segments = Gem::Version.new(RUBY_VERSION.dup).segments
 minor_version = ruby_version_segments[0..1].join('.')
 
 group :development do
-  gem "voxpupuli-test", '5.4.1',    require: false
+  gem "voxpupuli-test", '7.0.0',    require: false
   gem "faraday", '~> 1.0',          require: false
   gem "github_changelog_generator", require: false
   gem "puppet-blacksmith",          require: false
diff --git a/metadata.json b/metadata.json
index 7dff740..3842aa6 100644
--- a/metadata.json
+++ b/metadata.json
@@ -93,7 +93,7 @@
     "hpc",
     "gateway"
   ],
-  "pdk-version": "2.1.0",
+  "pdk-version": "2.7.1",
   "template-url": "https://github.com/treydock/pdk-templates.git#master",
-  "template-ref": "heads/master-0-gcb8e84f"
+  "template-ref": "heads/master-0-g76f4dbb"
 }
diff --git a/spec/classes/init_spec.rb b/spec/classes/init_spec.rb
index ed0d40a..8173591 100644
--- a/spec/classes/init_spec.rb
+++ b/spec/classes/init_spec.rb
@@ -4,7 +4,7 @@
 
 describe 'openondemand' do
   on_supported_os.each do |os, facts|
-    context "on #{os}" do
+    context "when #{os}" do
       let(:facts) do
         facts
       end
diff --git a/spec/defines/app_usr_spec.rb b/spec/defines/app_usr_spec.rb
index 5a49c8b..983f89e 100644
--- a/spec/defines/app_usr_spec.rb
+++ b/spec/defines/app_usr_spec.rb
@@ -4,7 +4,7 @@
 
 describe 'openondemand::app::usr' do
   on_supported_os(supported_os: [{ 'operatingsystem' => 'RedHat', 'operatingsystemrelease' => ['8'] }]).each do |os, facts|
-    context "on #{os}" do
+    context "when #{os}" do
       let(:facts) do
         facts
       end
diff --git a/spec/defines/cluster_spec.rb b/spec/defines/cluster_spec.rb
index a4abeb5..ced7bc9 100644
--- a/spec/defines/cluster_spec.rb
+++ b/spec/defines/cluster_spec.rb
@@ -4,7 +4,7 @@
 
 describe 'openondemand::cluster' do
   on_supported_os(supported_os: [{ 'operatingsystem' => 'RedHat', 'operatingsystemrelease' => ['8'] }]).each do |os, facts|
-    context "on #{os}" do
+    context "when #{os}" do
       let(:facts) do
         facts
       end
diff --git a/spec/defines/conf_spec.rb b/spec/defines/conf_spec.rb
index c13b1db..f8e0a3b 100644
--- a/spec/defines/conf_spec.rb
+++ b/spec/defines/conf_spec.rb
@@ -4,7 +4,7 @@
 
 describe 'openondemand::conf' do
   on_supported_os(supported_os: [{ 'operatingsystem' => 'RedHat', 'operatingsystemrelease' => ['8'] }]).each do |os, facts|
-    context "on #{os}" do
+    context "when #{os}" do
       let(:facts) do
         facts
       end
diff --git a/spec/defines/install_app_spec.rb b/spec/defines/install_app_spec.rb
index 0a1e62c..1335cf0 100644
--- a/spec/defines/install_app_spec.rb
+++ b/spec/defines/install_app_spec.rb
@@ -4,7 +4,7 @@
 
 describe 'openondemand::install::app' do
   on_supported_os(supported_os: [{ 'operatingsystem' => 'RedHat', 'operatingsystemrelease' => ['8'] }]).each do |os, facts|
-    context "on #{os}" do
+    context "when #{os}" do
       let(:facts) do
         facts
       end
diff --git a/tasks/nginx_stage.py b/tasks/nginx_stage.py
index e4be7cc..55ff188 100755
--- a/tasks/nginx_stage.py
+++ b/tasks/nginx_stage.py
@@ -25,6 +25,14 @@
         cmd.append('--force')
     process = subprocess.Popen(cmd, stdout=subprocess.PIPE, stderr=subprocess.PIPE)
     out, err = process.communicate()
+    try:
+        out = out.decode()
+    except (UnicodeDecodeError, AttributeError):
+        pass
+    try:
+        err = err.decode()
+    except (UnicodeDecodeError, AttributeError):
+        pass
     exitcode = process.returncode
     if exitcode == 0:
         if command in ['nginx_clean','nginx_list']: