diff --git a/spec/acceptance/install_spec.rb b/spec/acceptance/install_spec.rb
index 48e842f..066830d 100644
--- a/spec/acceptance/install_spec.rb
+++ b/spec/acceptance/install_spec.rb
@@ -151,7 +151,7 @@ context 'oracle', if: (
   end
 end
 
-context 'failure cases' do
+context 'with failure cases' do
   # C14711
   # SLES 10 returns an exit code of 0 on zypper failure
   unless fact('operatingsystem') == 'SLES' && fact('operatingsystemrelease') < '11'
diff --git a/spec/classes/java_spec.rb b/spec/classes/java_spec.rb
index 28d5e0a..69bd23f 100644
--- a/spec/classes/java_spec.rb
+++ b/spec/classes/java_spec.rb
@@ -1,35 +1,35 @@
 require 'spec_helper'
 
 describe 'java', type: :class do
-  context 'select openjdk for Centos 5.8' do
+  context 'when select openjdk for Centos 5.8' do
     let(:facts) { { osfamily: 'RedHat', operatingsystem: 'Centos', operatingsystemrelease: '5.8', architecture: 'x86_64' } }
 
     it { is_expected.to contain_package('java').with_name('java-1.6.0-openjdk-devel') }
     it { is_expected.to contain_file_line('java-home-environment').with_line('JAVA_HOME=/usr/lib/jvm/java-1.6.0/') }
   end
 
-  context 'select openjdk for Centos 6.3' do
+  context 'when select openjdk for Centos 6.3' do
     let(:facts) { { osfamily: 'RedHat', operatingsystem: 'Centos', operatingsystemrelease: '6.3', architecture: 'x86_64' } }
 
     it { is_expected.to contain_package('java').with_name('java-1.7.0-openjdk-devel') }
     it { is_expected.to contain_file_line('java-home-environment').with_line('JAVA_HOME=/usr/lib/jvm/java-1.7.0/') }
   end
 
-  context 'select openjdk for Centos 7.1.1503' do
+  context 'when select openjdk for Centos 7.1.1503' do
     let(:facts) { { osfamily: 'RedHat', operatingsystem: 'Centos', operatingsystemrelease: '7.1.1503', architecture: 'x86_64' } }
 
     it { is_expected.to contain_package('java').with_name('java-1.8.0-openjdk-devel') }
     it { is_expected.to contain_file_line('java-home-environment').with_line('JAVA_HOME=/usr/lib/jvm/java-1.8.0/') }
   end
 
-  context 'select openjdk for Centos 6.2' do
+  context 'when select openjdk for Centos 6.2' do
     let(:facts) { { osfamily: 'RedHat', operatingsystem: 'Centos', operatingsystemrelease: '6.2', architecture: 'x86_64' } }
 
     it { is_expected.to contain_package('java').with_name('java-1.6.0-openjdk-devel') }
     it { is_expected.not_to contain_exec('update-java-alternatives') }
   end
 
-  context 'select Oracle JRE with alternatives for Centos 6.3' do
+  context 'when select Oracle JRE with alternatives for Centos 6.3' do
     let(:facts) { { osfamily: 'RedHat', operatingsystem: 'Centos', operatingsystemrelease: '6.3', architecture: 'x86_64' } }
     let(:params) { { 'package' => 'jre', 'java_alternative' => '/usr/bin/java', 'java_alternative_path' => '/usr/java/jre1.7.0_67/bin/java' } }
 
@@ -38,21 +38,21 @@ describe 'java', type: :class do
     it { is_expected.to contain_exec('update-java-alternatives').with_command('alternatives --set java /usr/java/jre1.7.0_67/bin/java') }
   end
 
-  context 'select openjdk for Fedora 20' do
+  context 'when select openjdk for Fedora 20' do
     let(:facts) { { osfamily: 'RedHat', operatingsystem: 'Fedora', operatingsystemrelease: '20', architecture: 'x86_64' } }
 
     it { is_expected.to contain_package('java').with_name('java-1.7.0-openjdk-devel') }
     it { is_expected.to contain_file_line('java-home-environment').with_line('JAVA_HOME=/usr/lib/jvm/java-1.7.0-openjdk-x86_64/') }
   end
 
-  context 'select openjdk for Fedora 21' do
+  context 'when select openjdk for Fedora 21' do
     let(:facts) { { osfamily: 'RedHat', operatingsystem: 'Fedora', operatingsystemrelease: '21', architecture: 'x86_64' } }
 
     it { is_expected.to contain_package('java').with_name('java-1.8.0-openjdk-devel') }
     it { is_expected.to contain_file_line('java-home-environment').with_line('JAVA_HOME=/usr/lib/jvm/java-1.8.0-openjdk-x86_64/') }
   end
 
-  context 'select passed value for Fedora 20' do
+  context 'when select passed value for Fedora 20' do
     let(:facts) { { osfamily: 'RedHat', operatingsystem: 'Fedora', operatingsystemrelease: '20', architecture: 'x86_64' } }
     let(:params) { { 'distribution' => 'jre', 'java_home' => '/usr/local/lib/jre/' } }
 
@@ -60,7 +60,7 @@ describe 'java', type: :class do
     it { is_expected.to contain_file_line('java-home-environment').with_line('JAVA_HOME=/usr/local/lib/jre/') }
   end
 
-  context 'select passed value for Fedora 21' do
+  context 'when select passed value for Fedora 21' do
     let(:facts) { { osfamily: 'RedHat', operatingsystem: 'Fedora', operatingsystemrelease: '21', architecture: 'x86_64' } }
     let(:params) { { 'distribution' => 'jre', 'java_home' => '/usr/local/lib/jre/' } }
 
@@ -68,14 +68,14 @@ describe 'java', type: :class do
     it { is_expected.to contain_file_line('java-home-environment').with_line('JAVA_HOME=/usr/local/lib/jre/') }
   end
 
-  context 'select passed value for Fedora 21 with yum option' do
+  context 'when select passed value for Fedora 21 with yum option' do
     let(:facts) { { osfamily: 'RedHat', operatingsystem: 'Fedora', operatingsystemrelease: '21', architecture: 'x86_64' } }
     let(:params) { { 'distribution' => 'jre', 'package_options' => ['--skip-broken'] } }
 
     it { is_expected.to contain_package('java') }
   end
 
-  context 'select passed value for Centos 5.3' do
+  context 'when select passed value for Centos 5.3' do
     let(:facts) { { osfamily: 'RedHat', operatingsystem: 'Centos', operatingsystemrelease: '5.3', architecture: 'x86_64' } }
     let(:params) { { 'package' => 'jdk', 'java_home' => '/usr/local/lib/jre' } }
 
@@ -83,14 +83,14 @@ describe 'java', type: :class do
     it { is_expected.not_to contain_exec('update-java-alternatives') }
   end
 
-  context 'select default for Centos 5.3' do
+  context 'when select default for Centos 5.3' do
     let(:facts) { { osfamily: 'RedHat', operatingsystem: 'Centos', operatingsystemrelease: '5.3', architecture: 'x86_64' } }
 
     it { is_expected.to contain_package('java').with_name('java-1.6.0-openjdk-devel') }
     it { is_expected.not_to contain_exec('update-java-alternatives') }
   end
 
-  context 'select default for Debian Wheezy' do
+  context 'when select default for Debian Wheezy' do
     let(:facts) { { osfamily: 'Debian', operatingsystem: 'Debian', lsbdistcodename: 'wheezy', operatingsystemrelease: '7.1', architecture: 'amd64' } }
 
     it { is_expected.to contain_package('java').with_name('openjdk-7-jdk') }
@@ -98,7 +98,7 @@ describe 'java', type: :class do
     it { is_expected.to contain_file_line('java-home-environment').with_line('JAVA_HOME=/usr/lib/jvm/java-1.7.0-openjdk-amd64/') }
   end
 
-  context 'select Oracle JRE for Debian Wheezy' do
+  context 'when select Oracle JRE for Debian Wheezy' do
     let(:facts) { { osfamily: 'Debian', operatingsystem: 'Debian', lsbdistcodename: 'wheezy', operatingsystemrelease: '7.1', architecture: 'amd64' } }
     let(:params) { { 'distribution' => 'oracle-jre' } }
 
@@ -107,7 +107,7 @@ describe 'java', type: :class do
     it { is_expected.to contain_file_line('java-home-environment').with_line('JAVA_HOME=/usr/lib/jvm/j2re1.7-oracle/') }
   end
 
-  context 'select Oracle Java 8 JRE >=u100 for Debian Wheezy' do
+  context 'when select Oracle Java 8 JRE >=u100 for Debian Wheezy' do
     let(:facts) { { osfamily: 'Debian', operatingsystem: 'Debian', lsbdistcodename: 'wheezy', operatingsystemrelease: '7.1', architecture: 'amd64' } }
     let(:params) { { 'distribution' => 'oracle-java8-jre' } }
 
@@ -115,7 +115,7 @@ describe 'java', type: :class do
     it { is_expected.to contain_exec('update-java-alternatives').with_command('update-java-alternatives --set jre-8-oracle-x64 --jre') }
   end
 
-  context 'select Oracle Java 8 JDK >=u100 for Debian Wheezy' do
+  context 'when select Oracle Java 8 JDK >=u100 for Debian Wheezy' do
     let(:facts) { { osfamily: 'Debian', operatingsystem: 'Debian', lsbdistcodename: 'wheezy', operatingsystemrelease: '7.1', architecture: 'amd64' } }
     let(:params) { { 'distribution' => 'oracle-java8-jdk' } }
 
@@ -123,7 +123,7 @@ describe 'java', type: :class do
     it { is_expected.to contain_exec('update-java-alternatives').with_command('update-java-alternatives --set jdk-8-oracle-x64 --jre') }
   end
 
-  context 'select OpenJDK JRE for Debian Wheezy' do
+  context 'when select OpenJDK JRE for Debian Wheezy' do
     let(:facts) { { osfamily: 'Debian', operatingsystem: 'Debian', lsbdistcodename: 'wheezy', operatingsystemrelease: '7.1', architecture: 'amd64' } }
     let(:params) { { 'distribution' => 'jre' } }
 
@@ -132,14 +132,14 @@ describe 'java', type: :class do
     it { is_expected.to contain_file_line('java-home-environment').with_line('JAVA_HOME=/usr/lib/jvm/java-1.7.0-openjdk-amd64/') }
   end
 
-  context 'select default for Debian Squeeze' do
+  context 'when select default for Debian Squeeze' do
     let(:facts) { { osfamily: 'Debian', operatingsystem: 'Debian', lsbdistcodename: 'squeeze', operatingsystemrelease: '6.0.5', architecture: 'amd64' } }
 
     it { is_expected.to contain_package('java').with_name('openjdk-6-jdk') }
     it { is_expected.to contain_exec('update-java-alternatives').with_command('update-java-alternatives --set java-6-openjdk-amd64 --jre') }
   end
 
-  context 'select Oracle JRE for Debian Squeeze' do
+  context 'when select Oracle JRE for Debian Squeeze' do
     let(:facts) { { osfamily: 'Debian', operatingsystem: 'Debian', lsbdistcodename: 'squeeze', operatingsystemrelease: '6.0.5', architecture: 'amd64' } }
     let(:params) { { 'distribution' => 'sun-jre' } }
 
@@ -148,7 +148,7 @@ describe 'java', type: :class do
     it { is_expected.to contain_file_line('java-home-environment').with_line('JAVA_HOME=/usr/lib/jvm/java-6-sun/jre/') }
   end
 
-  context 'select OpenJDK JRE for Debian Squeeze' do
+  context 'when select OpenJDK JRE for Debian Squeeze' do
     let(:facts) { { osfamily: 'Debian', operatingsystem: 'Debian', lsbdistcodename: 'squeeze', operatingsystemrelease: '6.0.5', architecture: 'amd64' } }
     let(:params) { { 'distribution' => 'jre' } }
 
@@ -157,7 +157,7 @@ describe 'java', type: :class do
     it { is_expected.to contain_file_line('java-home-environment').with_line('JAVA_HOME=/usr/lib/jvm/java-6-openjdk/jre/') }
   end
 
-  context 'select random alternative for Debian Wheezy' do
+  context 'when select random alternative for Debian Wheezy' do
     let(:facts) { { osfamily: 'Debian', operatingsystem: 'Debian', lsbdistcodename: 'wheezy', operatingsystemrelease: '7.1', architecture: 'amd64' } }
     let(:params) { { 'java_alternative' => 'bananafish' } }
 
@@ -165,7 +165,7 @@ describe 'java', type: :class do
     it { is_expected.to contain_exec('update-java-alternatives').with_command('update-java-alternatives --set bananafish --jre') }
   end
 
-  context 'select jdk for Ubuntu Vivid (15.04)' do
+  context 'when select jdk for Ubuntu Vivid (15.04)' do
     let(:facts) { { osfamily: 'Debian', operatingsystem: 'Ubuntu', lsbdistcodename: 'vivid', operatingsystemrelease: '15.04', architecture: 'amd64' } }
     let(:params) { { 'distribution' => 'jdk' } }
 
@@ -173,7 +173,7 @@ describe 'java', type: :class do
     it { is_expected.to contain_file_line('java-home-environment').with_line('JAVA_HOME=/usr/lib/jvm/java-1.8.0-openjdk-amd64/') }
   end
 
-  context 'select jre for Ubuntu Vivid (15.04)' do
+  context 'when select jre for Ubuntu Vivid (15.04)' do
     let(:facts) { { osfamily: 'Debian', operatingsystem: 'Ubuntu', lsbdistcodename: 'vivid', operatingsystemrelease: '15.04', architecture: 'amd64' } }
     let(:params) { { 'distribution' => 'jre' } }
 
@@ -181,40 +181,40 @@ describe 'java', type: :class do
     it { is_expected.to contain_file_line('java-home-environment').with_line('JAVA_HOME=/usr/lib/jvm/java-1.8.0-openjdk-amd64/') }
   end
 
-  context 'select openjdk for Amazon Linux' do
+  context 'when select openjdk for Amazon Linux' do
     let(:facts) { { osfamily: 'RedHat', operatingsystem: 'Amazon', operatingsystemrelease: '3.4.43-43.43.amzn1.x86_64', architecture: 'x86_64' } }
 
     it { is_expected.to contain_package('java').with_name('java-1.7.0-openjdk-devel') }
     it { is_expected.to contain_file_line('java-home-environment').with_line('JAVA_HOME=/usr/lib/jvm/java-1.7.0-openjdk-x86_64/') }
   end
 
-  context 'select passed value for Amazon Linux' do
+  context 'when select passed value for Amazon Linux' do
     let(:facts) { { osfamily: 'RedHat', operatingsystem: 'Amazon', operatingsystemrelease: '5.3.4.43-43.43.amzn1.x86_64', architecture: 'x86_64' } }
     let(:params) { { 'distribution' => 'jre' } }
 
     it { is_expected.to contain_package('java').with_name('java-1.7.0-openjdk') }
   end
 
-  context 'select openjdk for Oracle Linux' do
+  context 'when select openjdk for Oracle Linux' do
     let(:facts) { { osfamily: 'RedHat', operatingsystem: 'OracleLinux', operatingsystemrelease: '6.4', architecture: 'x86_64' } }
 
     it { is_expected.to contain_package('java').with_name('java-1.7.0-openjdk-devel') }
   end
 
-  context 'select openjdk for Oracle Linux 6.2' do
+  context 'when select openjdk for Oracle Linux 6.2' do
     let(:facts) { { osfamily: 'RedHat', operatingsystem: 'OracleLinux', operatingsystemrelease: '6.2', architecture: 'x86_64' } }
 
     it { is_expected.to contain_package('java').with_name('java-1.6.0-openjdk-devel') }
   end
 
-  context 'select passed value for Oracle Linux' do
+  context 'when select passed value for Oracle Linux' do
     let(:facts) { { osfamily: 'RedHat', operatingsystem: 'OracleLinux', operatingsystemrelease: '6.3', architecture: 'x86_64' } }
     let(:params) { { 'distribution' => 'jre' } }
 
     it { is_expected.to contain_package('java').with_name('java-1.7.0-openjdk') }
   end
 
-  context 'select passed value for Scientific Linux' do
+  context 'when select passed value for Scientific Linux' do
     let(:facts) { { osfamily: 'RedHat', operatingsystem: 'Scientific', operatingsystemrelease: '6.4', architecture: 'x86_64' } }
     let(:params) { { 'distribution' => 'jre' } }
 
@@ -222,7 +222,7 @@ describe 'java', type: :class do
     it { is_expected.to contain_file_line('java-home-environment').with_line('JAVA_HOME=/usr/lib/jvm/java-1.7.0/') }
   end
 
-  context 'select passed value for Scientific Linux CERN (SLC)' do
+  context 'when select passed value for Scientific Linux CERN (SLC)' do
     let(:facts) { { osfamily: 'RedHat', operatingsystem: 'SLC', operatingsystemrelease: '6.4', architecture: 'x86_64' } }
     let(:params) { { 'distribution' => 'jre' } }
 
@@ -230,49 +230,49 @@ describe 'java', type: :class do
     it { is_expected.to contain_file_line('java-home-environment').with_line('JAVA_HOME=/usr/lib/jvm/java-1.7.0/') }
   end
 
-  context 'select default for OpenSUSE 12.3' do
+  context 'when select default for OpenSUSE 12.3' do
     let(:facts) { { osfamily: 'Suse', operatingsystem: 'OpenSUSE', operatingsystemrelease: '12.3', architecture: 'x86_64' } }
 
     it { is_expected.to contain_package('java').with_name('java-1_7_0-openjdk-devel') }
     it { is_expected.to contain_file_line('java-home-environment').with_line('JAVA_HOME=/usr/lib64/jvm/java-1.7.0-openjdk-1.7.0/') }
   end
 
-  context 'select default for SLES 11.3' do
+  context 'when select default for SLES 11.3' do
     let(:facts) { { osfamily: 'Suse', operatingsystem: 'SLES', operatingsystemrelease: '11.3', architecture: 'x86_64' } }
 
     it { is_expected.to contain_package('java').with_name('java-1_6_0-ibm-devel') }
     it { is_expected.to contain_file_line('java-home-environment').with_line('JAVA_HOME=/usr/lib64/jvm/java-1.6.0-ibm-1.6.0/') }
   end
 
-  context 'select default for SLES 11.4' do
+  context 'when select default for SLES 11.4' do
     let(:facts) { { osfamily: 'Suse', operatingsystem: 'SLES', operatingsystemrelease: '11.4', architecture: 'x86_64' } }
 
     it { is_expected.to contain_package('java').with_name('java-1_7_1-ibm-devel') }
     it { is_expected.to contain_file_line('java-home-environment').with_line('JAVA_HOME=/usr/lib64/jvm/java-1.7.0-ibm-1.7.0/') }
   end
 
-  context 'select default for SLES 12.0' do
+  context 'when select default for SLES 12.0' do
     let(:facts) { { osfamily: 'Suse', operatingsystem: 'SLES', operatingsystemrelease: '12.0', operatingsystemmajrelease: '12', architecture: 'x86_64' } }
 
     it { is_expected.to contain_package('java').with_name('java-1_7_0-openjdk-devel') }
     it { is_expected.to contain_file_line('java-home-environment').with_line('JAVA_HOME=/usr/lib64/jvm/java-1.7.0-openjdk-1.7.0/') }
   end
 
-  context 'select default for SLES 12.1' do
+  context 'when select default for SLES 12.1' do
     let(:facts) { { osfamily: 'Suse', operatingsystem: 'SLES', operatingsystemrelease: '12.1', operatingsystemmajrelease: '12', architecture: 'x86_64' } }
 
     it { is_expected.to contain_package('java').with_name('java-1_8_0-openjdk-devel') }
     it { is_expected.to contain_file_line('java-home-environment').with_line('JAVA_HOME=/usr/lib64/jvm/java-1.8.0-openjdk-1.8.0/') }
   end
 
-  context 'select jdk for OpenBSD' do
+  context 'when select jdk for OpenBSD' do
     let(:facts) { { osfamily: 'OpenBSD', architecture: 'x86_64' } }
 
     it { is_expected.to contain_package('java').with_name('jdk') }
     it { is_expected.not_to contain_file_line('java-home-environment') }
   end
 
-  context 'select jre for OpenBSD' do
+  context 'when select jre for OpenBSD' do
     let(:facts) { { osfamily: 'OpenBSD', architecture: 'x86_64' } }
     let(:params) { { 'distribution' => 'jre' } }
 
@@ -282,7 +282,7 @@ describe 'java', type: :class do
   describe 'custom java package' do
     let(:facts) { { osfamily: 'Debian', operatingsystem: 'Debian', lsbdistcodename: 'jessie', operatingsystemrelease: '8.6', architecture: 'amd64' } }
 
-    context 'all params provided' do
+    context 'when all params provided' do
       let(:params) do
         {
           'distribution' => 'custom',
@@ -297,7 +297,7 @@ describe 'java', type: :class do
       it { is_expected.to contain_file_line('java-home-environment').with_line('JAVA_HOME=/opt/custom_jdk') }
       it { is_expected.to contain_exec('update-java-alternatives').with_command('update-java-alternatives --set java-custom_jdk --jre') }
     end
-    context 'missing parameters' do
+    context 'with missing parameters' do
       let(:params) do
         {
           'distribution' => 'custom',
diff --git a/spec/defines/oracle_spec.rb b/spec/defines/oracle_spec.rb
index 740262c..afa85cf 100644
--- a/spec/defines/oracle_spec.rb
+++ b/spec/defines/oracle_spec.rb
@@ -3,10 +3,10 @@ require 'spec_helper'
 oracle_url = 'http://download.oracle.com/otn-pub/java/jdk/8u131-b11/d54c1d3a095b4ff2b6607d096fa80163/jdk-8u131-linux-x64.tar.gz'
 
 describe 'java::oracle', type: :define do
-  context 'On CentOS 64-bit' do
+  context 'with CentOS 64-bit' do
     let(:facts) { { kernel: 'Linux', os: { family: 'RedHat', architecture: 'x86_64', name: 'CentOS', release: { full: '6.0' } } } }
 
-    context 'Oracle Java SE 6 JDK' do
+    context 'when Oracle Java SE 6 JDK' do
       let(:params) { { ensure: 'present', version: '6', java_se: 'jdk' } }
       let(:title) { 'jdk6' }
 
@@ -15,7 +15,7 @@ describe 'java::oracle', type: :define do
       it { is_expected.to contain_exec('Install Oracle java_se jdk 6').that_requires('Archive[/tmp/jdk-6u45-linux-x64-rpm.bin]') }
     end
 
-    context 'Oracle Java SE 7 JDK' do
+    context 'when Oracle Java SE 7 JDK' do
       let(:params) { { ensure: 'present', version: '7', java_se: 'jdk' } }
       let(:title) { 'jdk7' }
 
@@ -24,7 +24,7 @@ describe 'java::oracle', type: :define do
       it { is_expected.to contain_exec('Install Oracle java_se jdk 7').that_requires('Archive[/tmp/jdk-7u80-linux-x64.rpm]') }
     end
 
-    context 'Oracle Java SE 8 JDK' do
+    context 'when Oracle Java SE 8 JDK' do
       let(:params) { { ensure: 'present', version: '8', java_se: 'jdk' } }
       let(:title) { 'jdk8' }
 
@@ -33,7 +33,7 @@ describe 'java::oracle', type: :define do
       it { is_expected.to contain_exec('Install Oracle java_se jdk 8').that_requires('Archive[/tmp/jdk-8u131-linux-x64.rpm]') }
     end
 
-    context 'Oracle Java SE 6 JRE' do
+    context 'when Oracle Java SE 6 JRE' do
       let(:params) { { ensure: 'present', version: '6', java_se: 'jre' } }
       let(:title) { 'jre6' }
 
@@ -42,7 +42,7 @@ describe 'java::oracle', type: :define do
       it { is_expected.to contain_exec('Install Oracle java_se jre 6').that_requires('Archive[/tmp/jre-6u45-linux-x64-rpm.bin]') }
     end
 
-    context 'Oracle Java SE 7 JRE' do
+    context 'when Oracle Java SE 7 JRE' do
       let(:params) { { ensure: 'present', version: '7', java_se: 'jre' } }
       let(:title) { 'jre7' }
 
@@ -51,7 +51,7 @@ describe 'java::oracle', type: :define do
       it { is_expected.to contain_exec('Install Oracle java_se jre 7').that_requires('Archive[/tmp/jre-7u80-linux-x64.rpm]') }
     end
 
-    context 'select Oracle Java SE 8 JRE' do
+    context 'when select Oracle Java SE 8 JRE' do
       let(:params) { { ensure: 'present', version: '8', java_se: 'jre' } }
       let(:title) { 'jre8' }
 
@@ -60,7 +60,7 @@ describe 'java::oracle', type: :define do
       it { is_expected.to contain_exec('Install Oracle java_se jre 8').that_requires('Archive[/tmp/jre-8u131-linux-x64.rpm]') }
     end
 
-    context 'Pass URL to url parameter' do
+    context 'when passing URL to url parameter' do
       let(:params) do
         {
           ensure: 'present',
@@ -79,7 +79,7 @@ describe 'java::oracle', type: :define do
       }
     end
 
-    context 'Pass a hash to url_hash parameter' do
+    context 'when passing a hash to url_hash parameter' do
       let(:params) do
         {
           ensure: 'present',
@@ -95,10 +95,10 @@ describe 'java::oracle', type: :define do
     end
   end
 
-  context 'On CentOS 32-bit' do
+  context 'when on CentOS 32-bit' do
     let(:facts) { { kernel: 'Linux', os: { family: 'RedHat', architecture: 'i386', name: 'CentOS', release: { full: '6.6' } } } }
 
-    context 'select Oracle Java SE 6 JDK on RedHat family, 32-bit' do
+    context 'when selecting Oracle Java SE 6 JDK on RedHat family, 32-bit' do
       let(:params) { { ensure: 'present', version: '6', java_se: 'jdk' } }
       let(:title) { 'jdk6' }
 
@@ -107,7 +107,7 @@ describe 'java::oracle', type: :define do
       it { is_expected.to contain_exec('Install Oracle java_se jdk 6').that_requires('Archive[/tmp/jdk-6u45-linux-i586-rpm.bin]') }
     end
 
-    context 'select Oracle Java SE 7 JDK on RedHat family, 32-bit' do
+    context 'when selecting Oracle Java SE 7 JDK on RedHat family, 32-bit' do
       let(:params) { { ensure: 'present', version: '7', java_se: 'jdk' } }
       let(:title) { 'jdk7' }
 
@@ -116,7 +116,7 @@ describe 'java::oracle', type: :define do
       it { is_expected.to contain_exec('Install Oracle java_se jdk 7').that_requires('Archive[/tmp/jdk-7u80-linux-i586.rpm]') }
     end
 
-    context 'select Oracle Java SE 8 JDK on RedHat family, 32-bit' do
+    context 'when selecting Oracle Java SE 8 JDK on RedHat family, 32-bit' do
       let(:params) { { ensure: 'present', version: '8', java_se: 'jdk' } }
       let(:title) { 'jdk8' }
 
@@ -125,7 +125,7 @@ describe 'java::oracle', type: :define do
       it { is_expected.to contain_exec('Install Oracle java_se jdk 8').that_requires('Archive[/tmp/jdk-8u131-linux-i586.rpm]') }
     end
 
-    context 'select Oracle Java SE 6 JRE on RedHat family, 32-bit' do
+    context 'when selecting Oracle Java SE 6 JRE on RedHat family, 32-bit' do
       let(:params) { { ensure: 'present', version: '6', java_se: 'jre' } }
       let(:title) { 'jdk6' }
 
@@ -134,7 +134,7 @@ describe 'java::oracle', type: :define do
       it { is_expected.to contain_exec('Install Oracle java_se jre 6').that_requires('Archive[/tmp/jre-6u45-linux-i586-rpm.bin]') }
     end
 
-    context 'select Oracle Java SE 7 JRE on RedHat family, 32-bit' do
+    context 'when select Oracle Java SE 7 JRE on RedHat family, 32-bit' do
       let(:params) { { ensure: 'present', version: '7', java_se: 'jre' } }
       let(:title) { 'jdk7' }
 
@@ -143,7 +143,7 @@ describe 'java::oracle', type: :define do
       it { is_expected.to contain_exec('Install Oracle java_se jre 7').that_requires('Archive[/tmp/jre-7u80-linux-i586.rpm]') }
     end
 
-    context 'select Oracle Java SE 8 JRE on RedHat family, 32-bit' do
+    context 'when select Oracle Java SE 8 JRE on RedHat family, 32-bit' do
       let(:params) { { ensure: 'present', version: '8', java_se: 'jre' } }
       let(:title) { 'jdk8' }
 
@@ -153,10 +153,10 @@ describe 'java::oracle', type: :define do
     end
   end
 
-  context 'On Ubuntu 64-bit' do
+  context 'with Ubuntu 64-bit' do
     let(:facts) { { kernel: 'Linux', os: { family: 'Debian', architecture: 'amd64', name: 'Ubuntu', release: { full: '16.04' } } } }
 
-    context 'Oracle Java SE 6 JDK' do
+    context 'when Oracle Java SE 6 JDK' do
       let(:params) { { ensure: 'present', version: '6', java_se: 'jdk' } }
       let(:title) { 'jdk6' }
 
@@ -165,7 +165,7 @@ describe 'java::oracle', type: :define do
       it { is_expected.to contain_exec('Install Oracle java_se jdk 6').that_requires('Archive[/tmp/jdk-6u45-linux-x64.tar.gz]') }
     end
 
-    context 'Oracle Java SE 7 JDK' do
+    context 'with Oracle Java SE 7 JDK' do
       let(:params) { { ensure: 'present', version: '7', java_se: 'jdk' } }
       let(:title) { 'jdk7' }
 
@@ -174,7 +174,7 @@ describe 'java::oracle', type: :define do
       it { is_expected.to contain_exec('Install Oracle java_se jdk 7').that_requires('Archive[/tmp/jdk-7u80-linux-x64.tar.gz]') }
     end
 
-    context 'Oracle Java SE 8 JDK' do
+    context 'with Oracle Java SE 8 JDK' do
       let(:params) { { ensure: 'present', version: '8', java_se: 'jdk' } }
       let(:title) { 'jdk8' }
 
@@ -183,7 +183,7 @@ describe 'java::oracle', type: :define do
       it { is_expected.to contain_exec('Install Oracle java_se jdk 8').that_requires('Archive[/tmp/jdk-8u131-linux-x64.tar.gz]') }
     end
 
-    context 'Oracle Java SE 6 JRE' do
+    context 'with Oracle Java SE 6 JRE' do
       let(:params) { { ensure: 'present', version: '6', java_se: 'jre' } }
       let(:title) { 'jre6' }
 
@@ -192,7 +192,7 @@ describe 'java::oracle', type: :define do
       it { is_expected.to contain_exec('Install Oracle java_se jre 6').that_requires('Archive[/tmp/jre-6u45-linux-x64.tar.gz]') }
     end
 
-    context 'Oracle Java SE 7 JRE' do
+    context 'when Oracle Java SE 7 JRE' do
       let(:params) { { ensure: 'present', version: '7', java_se: 'jre' } }
       let(:title) { 'jre7' }
 
@@ -201,7 +201,7 @@ describe 'java::oracle', type: :define do
       it { is_expected.to contain_exec('Install Oracle java_se jre 7').that_requires('Archive[/tmp/jre-7u80-linux-x64.tar.gz]') }
     end
 
-    context 'select Oracle Java SE 8 JRE' do
+    context 'when Oracle Java SE 8 JRE' do
       let(:params) { { ensure: 'present', version: '8', java_se: 'jre' } }
       let(:title) { 'jre8' }
 
@@ -210,7 +210,7 @@ describe 'java::oracle', type: :define do
       it { is_expected.to contain_exec('Install Oracle java_se jre 8').that_requires('Archive[/tmp/jre-8u131-linux-x64.tar.gz]') }
     end
 
-    context 'Pass URL to url parameter' do
+    context 'when passing URL to url parameter' do
       let(:params) { { ensure: 'present', version_major: '8u131', version_minor: 'b11', java_se: 'jdk', url: oracle_url.to_s } }
       let(:title) { 'jdk8' }
 
diff --git a/spec/unit/facter/java_default_home_spec.rb b/spec/unit/facter/java_default_home_spec.rb
index 0186833..a5909c3 100644
--- a/spec/unit/facter/java_default_home_spec.rb
+++ b/spec/unit/facter/java_default_home_spec.rb
@@ -26,7 +26,7 @@ describe 'java_default_home' do
     Facter.fact(:kernel).stubs(:value).returns('Linux')
   end
 
-  context 'returns java home path when java found in PATH' do
+  context 'when java found in PATH' do
     context 'when java is in /usr/lib/jvm/java-7-openjdk-amd64/jre/bin/java' do
       it do
         unlink_and_delete('./java_test')
@@ -44,7 +44,7 @@ describe 'java_default_home' do
     end
   end
 
-  context 'returns nil when java not present' do
+  context 'when java not present, return nil' do
     it do
       Facter::Util::Resolution.stubs(:exec)
       Facter::Util::Resolution.expects(:which).with('java').at_least(1).returns(false)
diff --git a/spec/unit/facter/java_libjvm_path_spec.rb b/spec/unit/facter/java_libjvm_path_spec.rb
index e64d96a..64dcb18 100644
--- a/spec/unit/facter/java_libjvm_path_spec.rb
+++ b/spec/unit/facter/java_libjvm_path_spec.rb
@@ -9,7 +9,7 @@ describe 'java_libjvm_path' do
     Dir.stubs(:glob).with("#{java_default_home}/jre/lib/**/libjvm.so").returns(['/usr/lib/jvm/java-8-openjdk-amd64/jre/lib/amd64/server/libjvm.so'])
   end
 
-  context 'returns libjvm path on Linux' do
+  context 'when on Linux, return libjvm path' do
     it do
       expect(Facter.value(:java_libjvm_path)).to eql '/usr/lib/jvm/java-8-openjdk-amd64/jre/lib/amd64/server'
     end
diff --git a/spec/unit/facter/java_major_version_spec.rb b/spec/unit/facter/java_major_version_spec.rb
index f13f989..b6a3a87 100644
--- a/spec/unit/facter/java_major_version_spec.rb
+++ b/spec/unit/facter/java_major_version_spec.rb
@@ -5,7 +5,7 @@ describe 'java_major_version' do
     Facter.clear
   end
 
-  context 'returns major version when java_version fact present' do
+  context 'when java_version fact present, returns major version' do
     before :each do
       Facter.fact(:java_version).stubs(:value).returns('1.7.0_71')
     end
@@ -14,7 +14,7 @@ describe 'java_major_version' do
     end
   end
 
-  context 'returns nil when java not present' do
+  context 'when java not present, returns nil' do
     before :each do
       Facter.fact(:java_version).stubs(:value).returns(nil)
     end
diff --git a/spec/unit/facter/java_patch_level_spec.rb b/spec/unit/facter/java_patch_level_spec.rb
index 5227df4..27b380a 100644
--- a/spec/unit/facter/java_patch_level_spec.rb
+++ b/spec/unit/facter/java_patch_level_spec.rb
@@ -5,7 +5,7 @@ describe 'java_patch_level' do
     Facter.clear
   end
 
-  context 'if java is installed returns java patch version extracted from java_version fact' do
+  context 'when java is installed returns java patch version extracted from java_version fact' do
     before :each do
       Facter.fact(:java_version).stubs(:value).returns('1.7.0_71')
     end
@@ -14,7 +14,7 @@ describe 'java_patch_level' do
     end
   end
 
-  context 'if java is not installed returns nil' do
+  context 'when java is not installed returns nil' do
     before :each do
       Facter.fact(:java_version).stubs(:value).returns(nil)
     end
diff --git a/spec/unit/facter/java_version_spec.rb b/spec/unit/facter/java_version_spec.rb
index 54a891a..029b840 100644
--- a/spec/unit/facter/java_version_spec.rb
+++ b/spec/unit/facter/java_version_spec.rb
@@ -15,7 +15,7 @@ describe 'java_version' do
     Facter.clear
   end
 
-  context 'returns java version when java present' do
+  context 'when java present, returns java version' do
     context 'on OpenBSD', with_env: true do
       before(:each) do
         Facter.fact(:operatingsystem).stubs(:value).returns('OpenBSD')
@@ -28,7 +28,7 @@ describe 'java_version' do
         expect(Facter.value(:java_version)).to eq('1.7.0_71')
       end
     end
-    context 'on Darwin' do
+    context 'when on Darwin' do
       before(:each) do
         Facter.fact(:operatingsystem).stubs(:value).returns('Darwin')
       end
@@ -40,7 +40,7 @@ describe 'java_version' do
         expect(Facter.value(:java_version)).to eql '1.7.0_71'
       end
     end
-    context 'on other systems' do
+    context 'when on other systems' do
       before(:each) do
         Facter.fact(:operatingsystem).stubs(:value).returns('MyOS')
       end
@@ -54,7 +54,7 @@ describe 'java_version' do
     end
   end
 
-  context 'returns nil when java not present' do
+  context 'when java not present, returns nil' do
     context 'on OpenBSD', with_env: true do
       before(:each) do
         Facter.fact(:operatingsystem).stubs(:value).returns('OpenBSD')
@@ -66,7 +66,7 @@ describe 'java_version' do
         expect(Facter.value(:java_version)).to be_nil
       end
     end
-    context 'on Darwin' do
+    context 'when on Darwin' do
       before(:each) do
         Facter.fact(:operatingsystem).stubs(:value).returns('Darwin')
       end
@@ -77,7 +77,7 @@ describe 'java_version' do
         expect(Facter.value(:java_version)).to be_nil
       end
     end
-    context 'on other systems' do
+    context 'when on other systems' do
       before(:each) do
         Facter.fact(:operatingsystem).stubs(:value).returns('MyOS')
       end