diff --git a/Vagrantfile b/Vagrantfile
index a95e7ba..8ba94d1 100644
--- a/Vagrantfile
+++ b/Vagrantfile
@@ -1,59 +1,60 @@
+# rubocop:disable Style/FileName
 # TODO: Find out why cassandra::params not working with vagrant and CentOS 6.2
 # TODO: Find out why cassandra::params not working with vagrant and CentOS 7.0
 # TODO: Find out why cassandra::params not working with vagrant and Ubuntu 12.04.
 Vagrant.configure('2') do |config|
   # config.vm.box = 'puppetlabs/centos-6.6-64-puppet'
   # config.vm.box = 'puppetlabs/centos-7.0-64-puppet'
   # config.vm.box = 'puppetlabs/debian-7.8-64-puppet'
   # config.vm.box = 'puppetlabs/debian-8.2-64-puppet'
   # config.vm.box = "puppetlabs/ubuntu-12.04-64-puppet"
   config.vm.box = 'puppetlabs/ubuntu-14.04-64-puppet'
   # config.vm.box = "puppetlabs/ubuntu-16.04-64-puppet"
 
   config.vm.provider 'virtualbox' do |vm|
     vm.memory = 2048
     vm.cpus = 2
   end
 
   puppet_environment = 'vagrant'
   puppet_environment_path_on_guest = "/etc/puppetlabs/code/environments/#{puppet_environment}"
   module_path_on_guest = "#{puppet_environment_path_on_guest}/modules"
 
   config.vm.synced_folder './vagrant',
                           '/etc/puppetlabs/code/environments/vagrant'
   config.vm.synced_folder '.',
                           '/etc/puppetlabs/code/environments/vagrant/modules/cassandra'
   config.vm.synced_folder './spec/acceptance/hieradata',
                           '/etc/puppetlabs/code/environments/vagrant/hieradata'
 
   metadata_json_file = "#{File.dirname(__FILE__)}/metadata.json"
   config.vm.provision :shell,
                       inline: "test -d #{module_path_on_guest}/ || mkdir #{puppet_environment_path_on_guest}"
 
   if File.exist?(metadata_json_file)
     JSON.parse(File.read(metadata_json_file))['dependencies'].each do |key, _value|
       module_name = key['name'].to_s
       short_name = module_name.split('-')[1]
       config.vm.provision :shell,
                           inline: "test -d #{module_path_on_guest}/#{short_name} || puppet module install #{module_name} --environment=#{puppet_environment}"
     end
   else
     puts 'metadata.json not found; skipping install of dependencies'
   end
 
   config.vm.provision :puppet do |puppet|
     puppet.options = ENV['PUPPET_OPTS'].split(' ') if ENV.key?('PUPPET_OPTS') # See http://stackoverflow.com/a/27540417/224334
     puppet.options = '--verbose --debug' if ENV['PUPPET_VERBOSE']
     puppet.hiera_config_path = 'vagrant/hiera.yaml'
     puppet.environment = puppet_environment
     puppet.environment_path = './'
     puppet.manifests_path   = "#{puppet_environment}/manifests"
     puppet.manifest_file = 'site.pp'
     puppet.facter = {
       project_name: 'ENGLISH NAME Of PROJECT', # EDIT THIS LINE
     }
   end
 
   config.vm.network :forwarded_port, guest: 22, host: 2223, auto_correct: true, id: 'ssh'
   # config.vm.network :forwarded_port, guest: 3000, host: 3000
 end
diff --git a/spec/unit/facter/cassandracmsheapnewsize_spec.rb b/spec/unit/facter/cassandracmsheapnewsize_spec.rb
index 25e49c9..f9f4ce2 100644
--- a/spec/unit/facter/cassandracmsheapnewsize_spec.rb
+++ b/spec/unit/facter/cassandracmsheapnewsize_spec.rb
@@ -1,115 +1,108 @@
 require 'spec_helper'
 
 describe 'Facter::Util::Fact' do
   before do
     Facter.clear
   end
 
   describe 'cassandrarelease DSE' do
     it do
       allow(Facter::Util::Resolution).
         to receive(:exec).with('nodetool version').
         and_return('2.1.11.969')
-      expect(Facter.fact(:cassandrarelease).value).to eql('2.1.11')
-      expect(Facter.fact(:cassandramajorversion).value).to be(2)
-      expect(Facter.fact(:cassandraminorversion).value).to be(1)
-      expect(Facter.fact(:cassandrapatchversion).value).to be(11)
     end
+
+    it { expect(Facter.fact(:cassandrarelease).value).to eql('2.1.11') }
+    it { expect(Facter.fact(:cassandramajorversion).value).to be(2) }
+    it { expect(Facter.fact(:cassandraminorversion).value).to be(1) }
+    it { expect(Facter.fact(:cassandrapatchversion).value).to be(11) }
   end
 
   describe 'cassandrarelease DDC' do
     it do
       allow(Facter::Util::Resolution).
         to receive(:exec).with('nodetool version').
         and_return('3.0.1')
-      expect(Facter.fact(:cassandrarelease).value).to eql('3.0.1')
-      expect(Facter.fact(:cassandramajorversion).value).to be(3)
-      expect(Facter.fact(:cassandraminorversion).value).to be(0)
-      expect(Facter.fact(:cassandrapatchversion).value).to be(1)
     end
+
+    it { expect(Facter.fact(:cassandrarelease).value).to eql('3.0.1') }
+    it { expect(Facter.fact(:cassandramajorversion).value).to be(3) }
+    it { expect(Facter.fact(:cassandraminorversion).value).to be(0) }
+    it { expect(Facter.fact(:cassandrapatchversion).value).to be(1) }
   end
 
   describe 'Cassandra not installed or not running' do
     it do
       allow(Facter::Util::Resolution).
         to receive(:exec).with('nodetool version').
         and_return('')
-      expect(Facter.fact(:cassandrarelease).value).to be(nil)
-      expect(Facter.fact(:cassandramajorversion).value).to be(nil)
-      expect(Facter.fact(:cassandraminorversion).value).to be(nil)
-      expect(Facter.fact(:cassandrapatchversion).value).to be(nil)
     end
+
+    it { expect(Facter.fact(:cassandrarelease).value).to be(nil) }
+    it { expect(Facter.fact(:cassandramajorversion).value).to be(nil) }
+    it { expect(Facter.fact(:cassandraminorversion).value).to be(nil) }
+    it { expect(Facter.fact(:cassandrapatchversion).value).to be(nil) }
   end
 
   describe 'Heap settings' do
     context 'Rasberry Pi 3' do
       before do
         Facter.fact(:memorysize_mb).stubs(:value).returns('1024')
         Facter.fact(:processorcount).stubs(:value).returns('4')
       end
 
-      it do
-        expect(Facter.fact(:cassandramaxheapsize).value).to eq(512)
-        expect(Facter.fact(:cassandracmsmaxheapsize).value).to be(512)
-        expect(Facter.fact(:cassandraheapnewsize).value).to be(128)
-        expect(Facter.fact(:cassandracmsheapnewsize).value).to be(128)
-      end
+      it { expect(Facter.fact(:cassandramaxheapsize).value).to eq(512) }
+      it { expect(Facter.fact(:cassandracmsmaxheapsize).value).to be(512) }
+      it { expect(Facter.fact(:cassandraheapnewsize).value).to be(128) }
+      it { expect(Facter.fact(:cassandracmsheapnewsize).value).to be(128) }
     end
 
     context 'm4.large' do
       before do
         Facter.fact(:memorysize_mb).stubs(:value).returns('8191.9')
         Facter.fact(:processorcount).stubs(:value).returns('2')
       end
 
-      it do
-        expect(Facter.fact(:cassandramaxheapsize).value).to be(2048)
-        expect(Facter.fact(:cassandracmsmaxheapsize).value).to be(2048)
-        expect(Facter.fact(:cassandraheapnewsize).value).to be(200)
-        expect(Facter.fact(:cassandracmsheapnewsize).value).to be(200)
-      end
+      it { expect(Facter.fact(:cassandramaxheapsize).value).to be(2048) }
+      it { expect(Facter.fact(:cassandracmsmaxheapsize).value).to be(2048) }
+      it { expect(Facter.fact(:cassandraheapnewsize).value).to be(200) }
+      it { expect(Facter.fact(:cassandracmsheapnewsize).value).to be(200) }
     end
 
     context 'm4.xlarge' do
       before do
         Facter.fact(:memorysize_mb).stubs(:value).returns('16384')
         Facter.fact(:processorcount).stubs(:value).returns('2')
       end
 
-      it do
-        expect(Facter.fact(:cassandramaxheapsize).value).to be(4096)
-        expect(Facter.fact(:cassandracmsmaxheapsize).value).to be(4096)
-        expect(Facter.fact(:cassandraheapnewsize).value).to be(200)
-        expect(Facter.fact(:cassandracmsheapnewsize).value).to be(200)
-      end
+      it { expect(Facter.fact(:cassandramaxheapsize).value).to be(4096) }
+      it { expect(Facter.fact(:cassandracmsmaxheapsize).value).to be(4096) }
+      it { expect(Facter.fact(:cassandraheapnewsize).value).to be(200) }
+      it { expect(Facter.fact(:cassandracmsheapnewsize).value).to be(200) }
     end
 
     context 'c4.2xlarge' do
       before do
         Facter.fact(:memorysize_mb).stubs(:value).returns('15360')
         Facter.fact(:processorcount).stubs(:value).returns('8')
       end
 
-      it do
-        expect(Facter.fact(:cassandramaxheapsize).value).to be(3840)
-        expect(Facter.fact(:cassandracmsmaxheapsize).value).to be(3840)
-        expect(Facter.fact(:cassandraheapnewsize).value).to be(800)
-        expect(Facter.fact(:cassandracmsheapnewsize).value).to be(800)
-      end
+      it { expect(Facter.fact(:cassandramaxheapsize).value).to be(3840) }
+      it { expect(Facter.fact(:cassandracmsmaxheapsize).value).to be(3840) }
+      it { expect(Facter.fact(:cassandraheapnewsize).value).to be(800) }
+      it { expect(Facter.fact(:cassandracmsheapnewsize).value).to be(800) }
     end
 
     context 'i2.2xlarge' do
       before do
         Facter.fact(:memorysize_mb).stubs(:value).returns('62464')
         Facter.fact(:processorcount).stubs(:value).returns('8')
       end
 
-      it do
-        expect(Facter.fact(:cassandramaxheapsize).value).to be(8192)
-        expect(Facter.fact(:cassandracmsmaxheapsize).value).to be(14_336)
-        expect(Facter.fact(:cassandraheapnewsize).value).to be(800)
-        expect(Facter.fact(:cassandracmsheapnewsize).value).to be(800)
-      end
+      it { expect(Facter.fact(:cassandramaxheapsize).value).to be(8192) }
+      it { expect(Facter.fact(:cassandracmsmaxheapsize).value).to be(14_336) }
+      it { expect(Facter.fact(:cassandraheapnewsize).value).to be(800) }
+      it { expect(Facter.fact(:cassandracmsheapnewsize).value).to be(800) }
     end
   end
 end
diff --git a/spec/unit/facter/cassandracmsmaxheapsize_spec.rb b/spec/unit/facter/cassandracmsmaxheapsize_spec.rb
index 25e49c9..f9f4ce2 100644
--- a/spec/unit/facter/cassandracmsmaxheapsize_spec.rb
+++ b/spec/unit/facter/cassandracmsmaxheapsize_spec.rb
@@ -1,115 +1,108 @@
 require 'spec_helper'
 
 describe 'Facter::Util::Fact' do
   before do
     Facter.clear
   end
 
   describe 'cassandrarelease DSE' do
     it do
       allow(Facter::Util::Resolution).
         to receive(:exec).with('nodetool version').
         and_return('2.1.11.969')
-      expect(Facter.fact(:cassandrarelease).value).to eql('2.1.11')
-      expect(Facter.fact(:cassandramajorversion).value).to be(2)
-      expect(Facter.fact(:cassandraminorversion).value).to be(1)
-      expect(Facter.fact(:cassandrapatchversion).value).to be(11)
     end
+
+    it { expect(Facter.fact(:cassandrarelease).value).to eql('2.1.11') }
+    it { expect(Facter.fact(:cassandramajorversion).value).to be(2) }
+    it { expect(Facter.fact(:cassandraminorversion).value).to be(1) }
+    it { expect(Facter.fact(:cassandrapatchversion).value).to be(11) }
   end
 
   describe 'cassandrarelease DDC' do
     it do
       allow(Facter::Util::Resolution).
         to receive(:exec).with('nodetool version').
         and_return('3.0.1')
-      expect(Facter.fact(:cassandrarelease).value).to eql('3.0.1')
-      expect(Facter.fact(:cassandramajorversion).value).to be(3)
-      expect(Facter.fact(:cassandraminorversion).value).to be(0)
-      expect(Facter.fact(:cassandrapatchversion).value).to be(1)
     end
+
+    it { expect(Facter.fact(:cassandrarelease).value).to eql('3.0.1') }
+    it { expect(Facter.fact(:cassandramajorversion).value).to be(3) }
+    it { expect(Facter.fact(:cassandraminorversion).value).to be(0) }
+    it { expect(Facter.fact(:cassandrapatchversion).value).to be(1) }
   end
 
   describe 'Cassandra not installed or not running' do
     it do
       allow(Facter::Util::Resolution).
         to receive(:exec).with('nodetool version').
         and_return('')
-      expect(Facter.fact(:cassandrarelease).value).to be(nil)
-      expect(Facter.fact(:cassandramajorversion).value).to be(nil)
-      expect(Facter.fact(:cassandraminorversion).value).to be(nil)
-      expect(Facter.fact(:cassandrapatchversion).value).to be(nil)
     end
+
+    it { expect(Facter.fact(:cassandrarelease).value).to be(nil) }
+    it { expect(Facter.fact(:cassandramajorversion).value).to be(nil) }
+    it { expect(Facter.fact(:cassandraminorversion).value).to be(nil) }
+    it { expect(Facter.fact(:cassandrapatchversion).value).to be(nil) }
   end
 
   describe 'Heap settings' do
     context 'Rasberry Pi 3' do
       before do
         Facter.fact(:memorysize_mb).stubs(:value).returns('1024')
         Facter.fact(:processorcount).stubs(:value).returns('4')
       end
 
-      it do
-        expect(Facter.fact(:cassandramaxheapsize).value).to eq(512)
-        expect(Facter.fact(:cassandracmsmaxheapsize).value).to be(512)
-        expect(Facter.fact(:cassandraheapnewsize).value).to be(128)
-        expect(Facter.fact(:cassandracmsheapnewsize).value).to be(128)
-      end
+      it { expect(Facter.fact(:cassandramaxheapsize).value).to eq(512) }
+      it { expect(Facter.fact(:cassandracmsmaxheapsize).value).to be(512) }
+      it { expect(Facter.fact(:cassandraheapnewsize).value).to be(128) }
+      it { expect(Facter.fact(:cassandracmsheapnewsize).value).to be(128) }
     end
 
     context 'm4.large' do
       before do
         Facter.fact(:memorysize_mb).stubs(:value).returns('8191.9')
         Facter.fact(:processorcount).stubs(:value).returns('2')
       end
 
-      it do
-        expect(Facter.fact(:cassandramaxheapsize).value).to be(2048)
-        expect(Facter.fact(:cassandracmsmaxheapsize).value).to be(2048)
-        expect(Facter.fact(:cassandraheapnewsize).value).to be(200)
-        expect(Facter.fact(:cassandracmsheapnewsize).value).to be(200)
-      end
+      it { expect(Facter.fact(:cassandramaxheapsize).value).to be(2048) }
+      it { expect(Facter.fact(:cassandracmsmaxheapsize).value).to be(2048) }
+      it { expect(Facter.fact(:cassandraheapnewsize).value).to be(200) }
+      it { expect(Facter.fact(:cassandracmsheapnewsize).value).to be(200) }
     end
 
     context 'm4.xlarge' do
       before do
         Facter.fact(:memorysize_mb).stubs(:value).returns('16384')
         Facter.fact(:processorcount).stubs(:value).returns('2')
       end
 
-      it do
-        expect(Facter.fact(:cassandramaxheapsize).value).to be(4096)
-        expect(Facter.fact(:cassandracmsmaxheapsize).value).to be(4096)
-        expect(Facter.fact(:cassandraheapnewsize).value).to be(200)
-        expect(Facter.fact(:cassandracmsheapnewsize).value).to be(200)
-      end
+      it { expect(Facter.fact(:cassandramaxheapsize).value).to be(4096) }
+      it { expect(Facter.fact(:cassandracmsmaxheapsize).value).to be(4096) }
+      it { expect(Facter.fact(:cassandraheapnewsize).value).to be(200) }
+      it { expect(Facter.fact(:cassandracmsheapnewsize).value).to be(200) }
     end
 
     context 'c4.2xlarge' do
       before do
         Facter.fact(:memorysize_mb).stubs(:value).returns('15360')
         Facter.fact(:processorcount).stubs(:value).returns('8')
       end
 
-      it do
-        expect(Facter.fact(:cassandramaxheapsize).value).to be(3840)
-        expect(Facter.fact(:cassandracmsmaxheapsize).value).to be(3840)
-        expect(Facter.fact(:cassandraheapnewsize).value).to be(800)
-        expect(Facter.fact(:cassandracmsheapnewsize).value).to be(800)
-      end
+      it { expect(Facter.fact(:cassandramaxheapsize).value).to be(3840) }
+      it { expect(Facter.fact(:cassandracmsmaxheapsize).value).to be(3840) }
+      it { expect(Facter.fact(:cassandraheapnewsize).value).to be(800) }
+      it { expect(Facter.fact(:cassandracmsheapnewsize).value).to be(800) }
     end
 
     context 'i2.2xlarge' do
       before do
         Facter.fact(:memorysize_mb).stubs(:value).returns('62464')
         Facter.fact(:processorcount).stubs(:value).returns('8')
       end
 
-      it do
-        expect(Facter.fact(:cassandramaxheapsize).value).to be(8192)
-        expect(Facter.fact(:cassandracmsmaxheapsize).value).to be(14_336)
-        expect(Facter.fact(:cassandraheapnewsize).value).to be(800)
-        expect(Facter.fact(:cassandracmsheapnewsize).value).to be(800)
-      end
+      it { expect(Facter.fact(:cassandramaxheapsize).value).to be(8192) }
+      it { expect(Facter.fact(:cassandracmsmaxheapsize).value).to be(14_336) }
+      it { expect(Facter.fact(:cassandraheapnewsize).value).to be(800) }
+      it { expect(Facter.fact(:cassandracmsheapnewsize).value).to be(800) }
     end
   end
 end
diff --git a/spec/unit/facter/cassandraheapnewsize_spec.rb b/spec/unit/facter/cassandraheapnewsize_spec.rb
index 25e49c9..f9f4ce2 100644
--- a/spec/unit/facter/cassandraheapnewsize_spec.rb
+++ b/spec/unit/facter/cassandraheapnewsize_spec.rb
@@ -1,115 +1,108 @@
 require 'spec_helper'
 
 describe 'Facter::Util::Fact' do
   before do
     Facter.clear
   end
 
   describe 'cassandrarelease DSE' do
     it do
       allow(Facter::Util::Resolution).
         to receive(:exec).with('nodetool version').
         and_return('2.1.11.969')
-      expect(Facter.fact(:cassandrarelease).value).to eql('2.1.11')
-      expect(Facter.fact(:cassandramajorversion).value).to be(2)
-      expect(Facter.fact(:cassandraminorversion).value).to be(1)
-      expect(Facter.fact(:cassandrapatchversion).value).to be(11)
     end
+
+    it { expect(Facter.fact(:cassandrarelease).value).to eql('2.1.11') }
+    it { expect(Facter.fact(:cassandramajorversion).value).to be(2) }
+    it { expect(Facter.fact(:cassandraminorversion).value).to be(1) }
+    it { expect(Facter.fact(:cassandrapatchversion).value).to be(11) }
   end
 
   describe 'cassandrarelease DDC' do
     it do
       allow(Facter::Util::Resolution).
         to receive(:exec).with('nodetool version').
         and_return('3.0.1')
-      expect(Facter.fact(:cassandrarelease).value).to eql('3.0.1')
-      expect(Facter.fact(:cassandramajorversion).value).to be(3)
-      expect(Facter.fact(:cassandraminorversion).value).to be(0)
-      expect(Facter.fact(:cassandrapatchversion).value).to be(1)
     end
+
+    it { expect(Facter.fact(:cassandrarelease).value).to eql('3.0.1') }
+    it { expect(Facter.fact(:cassandramajorversion).value).to be(3) }
+    it { expect(Facter.fact(:cassandraminorversion).value).to be(0) }
+    it { expect(Facter.fact(:cassandrapatchversion).value).to be(1) }
   end
 
   describe 'Cassandra not installed or not running' do
     it do
       allow(Facter::Util::Resolution).
         to receive(:exec).with('nodetool version').
         and_return('')
-      expect(Facter.fact(:cassandrarelease).value).to be(nil)
-      expect(Facter.fact(:cassandramajorversion).value).to be(nil)
-      expect(Facter.fact(:cassandraminorversion).value).to be(nil)
-      expect(Facter.fact(:cassandrapatchversion).value).to be(nil)
     end
+
+    it { expect(Facter.fact(:cassandrarelease).value).to be(nil) }
+    it { expect(Facter.fact(:cassandramajorversion).value).to be(nil) }
+    it { expect(Facter.fact(:cassandraminorversion).value).to be(nil) }
+    it { expect(Facter.fact(:cassandrapatchversion).value).to be(nil) }
   end
 
   describe 'Heap settings' do
     context 'Rasberry Pi 3' do
       before do
         Facter.fact(:memorysize_mb).stubs(:value).returns('1024')
         Facter.fact(:processorcount).stubs(:value).returns('4')
       end
 
-      it do
-        expect(Facter.fact(:cassandramaxheapsize).value).to eq(512)
-        expect(Facter.fact(:cassandracmsmaxheapsize).value).to be(512)
-        expect(Facter.fact(:cassandraheapnewsize).value).to be(128)
-        expect(Facter.fact(:cassandracmsheapnewsize).value).to be(128)
-      end
+      it { expect(Facter.fact(:cassandramaxheapsize).value).to eq(512) }
+      it { expect(Facter.fact(:cassandracmsmaxheapsize).value).to be(512) }
+      it { expect(Facter.fact(:cassandraheapnewsize).value).to be(128) }
+      it { expect(Facter.fact(:cassandracmsheapnewsize).value).to be(128) }
     end
 
     context 'm4.large' do
       before do
         Facter.fact(:memorysize_mb).stubs(:value).returns('8191.9')
         Facter.fact(:processorcount).stubs(:value).returns('2')
       end
 
-      it do
-        expect(Facter.fact(:cassandramaxheapsize).value).to be(2048)
-        expect(Facter.fact(:cassandracmsmaxheapsize).value).to be(2048)
-        expect(Facter.fact(:cassandraheapnewsize).value).to be(200)
-        expect(Facter.fact(:cassandracmsheapnewsize).value).to be(200)
-      end
+      it { expect(Facter.fact(:cassandramaxheapsize).value).to be(2048) }
+      it { expect(Facter.fact(:cassandracmsmaxheapsize).value).to be(2048) }
+      it { expect(Facter.fact(:cassandraheapnewsize).value).to be(200) }
+      it { expect(Facter.fact(:cassandracmsheapnewsize).value).to be(200) }
     end
 
     context 'm4.xlarge' do
       before do
         Facter.fact(:memorysize_mb).stubs(:value).returns('16384')
         Facter.fact(:processorcount).stubs(:value).returns('2')
       end
 
-      it do
-        expect(Facter.fact(:cassandramaxheapsize).value).to be(4096)
-        expect(Facter.fact(:cassandracmsmaxheapsize).value).to be(4096)
-        expect(Facter.fact(:cassandraheapnewsize).value).to be(200)
-        expect(Facter.fact(:cassandracmsheapnewsize).value).to be(200)
-      end
+      it { expect(Facter.fact(:cassandramaxheapsize).value).to be(4096) }
+      it { expect(Facter.fact(:cassandracmsmaxheapsize).value).to be(4096) }
+      it { expect(Facter.fact(:cassandraheapnewsize).value).to be(200) }
+      it { expect(Facter.fact(:cassandracmsheapnewsize).value).to be(200) }
     end
 
     context 'c4.2xlarge' do
       before do
         Facter.fact(:memorysize_mb).stubs(:value).returns('15360')
         Facter.fact(:processorcount).stubs(:value).returns('8')
       end
 
-      it do
-        expect(Facter.fact(:cassandramaxheapsize).value).to be(3840)
-        expect(Facter.fact(:cassandracmsmaxheapsize).value).to be(3840)
-        expect(Facter.fact(:cassandraheapnewsize).value).to be(800)
-        expect(Facter.fact(:cassandracmsheapnewsize).value).to be(800)
-      end
+      it { expect(Facter.fact(:cassandramaxheapsize).value).to be(3840) }
+      it { expect(Facter.fact(:cassandracmsmaxheapsize).value).to be(3840) }
+      it { expect(Facter.fact(:cassandraheapnewsize).value).to be(800) }
+      it { expect(Facter.fact(:cassandracmsheapnewsize).value).to be(800) }
     end
 
     context 'i2.2xlarge' do
       before do
         Facter.fact(:memorysize_mb).stubs(:value).returns('62464')
         Facter.fact(:processorcount).stubs(:value).returns('8')
       end
 
-      it do
-        expect(Facter.fact(:cassandramaxheapsize).value).to be(8192)
-        expect(Facter.fact(:cassandracmsmaxheapsize).value).to be(14_336)
-        expect(Facter.fact(:cassandraheapnewsize).value).to be(800)
-        expect(Facter.fact(:cassandracmsheapnewsize).value).to be(800)
-      end
+      it { expect(Facter.fact(:cassandramaxheapsize).value).to be(8192) }
+      it { expect(Facter.fact(:cassandracmsmaxheapsize).value).to be(14_336) }
+      it { expect(Facter.fact(:cassandraheapnewsize).value).to be(800) }
+      it { expect(Facter.fact(:cassandracmsheapnewsize).value).to be(800) }
     end
   end
 end
diff --git a/spec/unit/facter/cassandramajorversion_spec.rb b/spec/unit/facter/cassandramajorversion_spec.rb
index 799d60d..2c1bdd6 100644
--- a/spec/unit/facter/cassandramajorversion_spec.rb
+++ b/spec/unit/facter/cassandramajorversion_spec.rb
@@ -1,43 +1,46 @@
 require 'spec_helper'
 
 describe 'Facter::Util::Fact' do
   before do
     Facter.clear
   end
 
   describe 'cassandrarelease DSE' do
     it do
       allow(Facter::Util::Resolution).
         to receive(:exec).with('nodetool version').
         and_return('2.1.11.969')
-      expect(Facter.fact(:cassandrarelease).value).to eql('2.1.11')
-      expect(Facter.fact(:cassandramajorversion).value).to be(2)
-      expect(Facter.fact(:cassandraminorversion).value).to be(1)
-      expect(Facter.fact(:cassandrapatchversion).value).to be(11)
     end
+
+    it { expect(Facter.fact(:cassandrarelease).value).to eql('2.1.11') }
+    it { expect(Facter.fact(:cassandramajorversion).value).to be(2) }
+    it { expect(Facter.fact(:cassandraminorversion).value).to be(1) }
+    it { expect(Facter.fact(:cassandrapatchversion).value).to be(11) }
   end
 
   describe 'cassandrarelease DDC' do
     it do
       allow(Facter::Util::Resolution).
         to receive(:exec).with('nodetool version').
         and_return('3.0.1')
-      expect(Facter.fact(:cassandrarelease).value).to eql('3.0.1')
-      expect(Facter.fact(:cassandramajorversion).value).to be(3)
-      expect(Facter.fact(:cassandraminorversion).value).to be(0)
-      expect(Facter.fact(:cassandrapatchversion).value).to be(1)
     end
+
+    it { expect(Facter.fact(:cassandrarelease).value).to eql('3.0.1') }
+    it { expect(Facter.fact(:cassandramajorversion).value).to be(3) }
+    it { expect(Facter.fact(:cassandraminorversion).value).to be(0) }
+    it { expect(Facter.fact(:cassandrapatchversion).value).to be(1) }
   end
 
   describe 'Cassandra not installed or not running' do
     it do
       allow(Facter::Util::Resolution).
         to receive(:exec).with('nodetool version').
         and_return('')
-      expect(Facter.fact(:cassandrarelease).value).to be(nil)
-      expect(Facter.fact(:cassandramajorversion).value).to be(nil)
-      expect(Facter.fact(:cassandraminorversion).value).to be(nil)
-      expect(Facter.fact(:cassandrapatchversion).value).to be(nil)
     end
+
+    it { expect(Facter.fact(:cassandrarelease).value).to be(nil) }
+    it { expect(Facter.fact(:cassandramajorversion).value).to be(nil) }
+    it { expect(Facter.fact(:cassandraminorversion).value).to be(nil) }
+    it { expect(Facter.fact(:cassandrapatchversion).value).to be(nil) }
   end
 end
diff --git a/spec/unit/facter/cassandramaxheapsize_spec.rb b/spec/unit/facter/cassandramaxheapsize_spec.rb
index 25e49c9..f9f4ce2 100644
--- a/spec/unit/facter/cassandramaxheapsize_spec.rb
+++ b/spec/unit/facter/cassandramaxheapsize_spec.rb
@@ -1,115 +1,108 @@
 require 'spec_helper'
 
 describe 'Facter::Util::Fact' do
   before do
     Facter.clear
   end
 
   describe 'cassandrarelease DSE' do
     it do
       allow(Facter::Util::Resolution).
         to receive(:exec).with('nodetool version').
         and_return('2.1.11.969')
-      expect(Facter.fact(:cassandrarelease).value).to eql('2.1.11')
-      expect(Facter.fact(:cassandramajorversion).value).to be(2)
-      expect(Facter.fact(:cassandraminorversion).value).to be(1)
-      expect(Facter.fact(:cassandrapatchversion).value).to be(11)
     end
+
+    it { expect(Facter.fact(:cassandrarelease).value).to eql('2.1.11') }
+    it { expect(Facter.fact(:cassandramajorversion).value).to be(2) }
+    it { expect(Facter.fact(:cassandraminorversion).value).to be(1) }
+    it { expect(Facter.fact(:cassandrapatchversion).value).to be(11) }
   end
 
   describe 'cassandrarelease DDC' do
     it do
       allow(Facter::Util::Resolution).
         to receive(:exec).with('nodetool version').
         and_return('3.0.1')
-      expect(Facter.fact(:cassandrarelease).value).to eql('3.0.1')
-      expect(Facter.fact(:cassandramajorversion).value).to be(3)
-      expect(Facter.fact(:cassandraminorversion).value).to be(0)
-      expect(Facter.fact(:cassandrapatchversion).value).to be(1)
     end
+
+    it { expect(Facter.fact(:cassandrarelease).value).to eql('3.0.1') }
+    it { expect(Facter.fact(:cassandramajorversion).value).to be(3) }
+    it { expect(Facter.fact(:cassandraminorversion).value).to be(0) }
+    it { expect(Facter.fact(:cassandrapatchversion).value).to be(1) }
   end
 
   describe 'Cassandra not installed or not running' do
     it do
       allow(Facter::Util::Resolution).
         to receive(:exec).with('nodetool version').
         and_return('')
-      expect(Facter.fact(:cassandrarelease).value).to be(nil)
-      expect(Facter.fact(:cassandramajorversion).value).to be(nil)
-      expect(Facter.fact(:cassandraminorversion).value).to be(nil)
-      expect(Facter.fact(:cassandrapatchversion).value).to be(nil)
     end
+
+    it { expect(Facter.fact(:cassandrarelease).value).to be(nil) }
+    it { expect(Facter.fact(:cassandramajorversion).value).to be(nil) }
+    it { expect(Facter.fact(:cassandraminorversion).value).to be(nil) }
+    it { expect(Facter.fact(:cassandrapatchversion).value).to be(nil) }
   end
 
   describe 'Heap settings' do
     context 'Rasberry Pi 3' do
       before do
         Facter.fact(:memorysize_mb).stubs(:value).returns('1024')
         Facter.fact(:processorcount).stubs(:value).returns('4')
       end
 
-      it do
-        expect(Facter.fact(:cassandramaxheapsize).value).to eq(512)
-        expect(Facter.fact(:cassandracmsmaxheapsize).value).to be(512)
-        expect(Facter.fact(:cassandraheapnewsize).value).to be(128)
-        expect(Facter.fact(:cassandracmsheapnewsize).value).to be(128)
-      end
+      it { expect(Facter.fact(:cassandramaxheapsize).value).to eq(512) }
+      it { expect(Facter.fact(:cassandracmsmaxheapsize).value).to be(512) }
+      it { expect(Facter.fact(:cassandraheapnewsize).value).to be(128) }
+      it { expect(Facter.fact(:cassandracmsheapnewsize).value).to be(128) }
     end
 
     context 'm4.large' do
       before do
         Facter.fact(:memorysize_mb).stubs(:value).returns('8191.9')
         Facter.fact(:processorcount).stubs(:value).returns('2')
       end
 
-      it do
-        expect(Facter.fact(:cassandramaxheapsize).value).to be(2048)
-        expect(Facter.fact(:cassandracmsmaxheapsize).value).to be(2048)
-        expect(Facter.fact(:cassandraheapnewsize).value).to be(200)
-        expect(Facter.fact(:cassandracmsheapnewsize).value).to be(200)
-      end
+      it { expect(Facter.fact(:cassandramaxheapsize).value).to be(2048) }
+      it { expect(Facter.fact(:cassandracmsmaxheapsize).value).to be(2048) }
+      it { expect(Facter.fact(:cassandraheapnewsize).value).to be(200) }
+      it { expect(Facter.fact(:cassandracmsheapnewsize).value).to be(200) }
     end
 
     context 'm4.xlarge' do
       before do
         Facter.fact(:memorysize_mb).stubs(:value).returns('16384')
         Facter.fact(:processorcount).stubs(:value).returns('2')
       end
 
-      it do
-        expect(Facter.fact(:cassandramaxheapsize).value).to be(4096)
-        expect(Facter.fact(:cassandracmsmaxheapsize).value).to be(4096)
-        expect(Facter.fact(:cassandraheapnewsize).value).to be(200)
-        expect(Facter.fact(:cassandracmsheapnewsize).value).to be(200)
-      end
+      it { expect(Facter.fact(:cassandramaxheapsize).value).to be(4096) }
+      it { expect(Facter.fact(:cassandracmsmaxheapsize).value).to be(4096) }
+      it { expect(Facter.fact(:cassandraheapnewsize).value).to be(200) }
+      it { expect(Facter.fact(:cassandracmsheapnewsize).value).to be(200) }
     end
 
     context 'c4.2xlarge' do
       before do
         Facter.fact(:memorysize_mb).stubs(:value).returns('15360')
         Facter.fact(:processorcount).stubs(:value).returns('8')
       end
 
-      it do
-        expect(Facter.fact(:cassandramaxheapsize).value).to be(3840)
-        expect(Facter.fact(:cassandracmsmaxheapsize).value).to be(3840)
-        expect(Facter.fact(:cassandraheapnewsize).value).to be(800)
-        expect(Facter.fact(:cassandracmsheapnewsize).value).to be(800)
-      end
+      it { expect(Facter.fact(:cassandramaxheapsize).value).to be(3840) }
+      it { expect(Facter.fact(:cassandracmsmaxheapsize).value).to be(3840) }
+      it { expect(Facter.fact(:cassandraheapnewsize).value).to be(800) }
+      it { expect(Facter.fact(:cassandracmsheapnewsize).value).to be(800) }
     end
 
     context 'i2.2xlarge' do
       before do
         Facter.fact(:memorysize_mb).stubs(:value).returns('62464')
         Facter.fact(:processorcount).stubs(:value).returns('8')
       end
 
-      it do
-        expect(Facter.fact(:cassandramaxheapsize).value).to be(8192)
-        expect(Facter.fact(:cassandracmsmaxheapsize).value).to be(14_336)
-        expect(Facter.fact(:cassandraheapnewsize).value).to be(800)
-        expect(Facter.fact(:cassandracmsheapnewsize).value).to be(800)
-      end
+      it { expect(Facter.fact(:cassandramaxheapsize).value).to be(8192) }
+      it { expect(Facter.fact(:cassandracmsmaxheapsize).value).to be(14_336) }
+      it { expect(Facter.fact(:cassandraheapnewsize).value).to be(800) }
+      it { expect(Facter.fact(:cassandracmsheapnewsize).value).to be(800) }
     end
   end
 end
diff --git a/spec/unit/facter/cassandraminorversion_spec.rb b/spec/unit/facter/cassandraminorversion_spec.rb
index 799d60d..2c1bdd6 100644
--- a/spec/unit/facter/cassandraminorversion_spec.rb
+++ b/spec/unit/facter/cassandraminorversion_spec.rb
@@ -1,43 +1,46 @@
 require 'spec_helper'
 
 describe 'Facter::Util::Fact' do
   before do
     Facter.clear
   end
 
   describe 'cassandrarelease DSE' do
     it do
       allow(Facter::Util::Resolution).
         to receive(:exec).with('nodetool version').
         and_return('2.1.11.969')
-      expect(Facter.fact(:cassandrarelease).value).to eql('2.1.11')
-      expect(Facter.fact(:cassandramajorversion).value).to be(2)
-      expect(Facter.fact(:cassandraminorversion).value).to be(1)
-      expect(Facter.fact(:cassandrapatchversion).value).to be(11)
     end
+
+    it { expect(Facter.fact(:cassandrarelease).value).to eql('2.1.11') }
+    it { expect(Facter.fact(:cassandramajorversion).value).to be(2) }
+    it { expect(Facter.fact(:cassandraminorversion).value).to be(1) }
+    it { expect(Facter.fact(:cassandrapatchversion).value).to be(11) }
   end
 
   describe 'cassandrarelease DDC' do
     it do
       allow(Facter::Util::Resolution).
         to receive(:exec).with('nodetool version').
         and_return('3.0.1')
-      expect(Facter.fact(:cassandrarelease).value).to eql('3.0.1')
-      expect(Facter.fact(:cassandramajorversion).value).to be(3)
-      expect(Facter.fact(:cassandraminorversion).value).to be(0)
-      expect(Facter.fact(:cassandrapatchversion).value).to be(1)
     end
+
+    it { expect(Facter.fact(:cassandrarelease).value).to eql('3.0.1') }
+    it { expect(Facter.fact(:cassandramajorversion).value).to be(3) }
+    it { expect(Facter.fact(:cassandraminorversion).value).to be(0) }
+    it { expect(Facter.fact(:cassandrapatchversion).value).to be(1) }
   end
 
   describe 'Cassandra not installed or not running' do
     it do
       allow(Facter::Util::Resolution).
         to receive(:exec).with('nodetool version').
         and_return('')
-      expect(Facter.fact(:cassandrarelease).value).to be(nil)
-      expect(Facter.fact(:cassandramajorversion).value).to be(nil)
-      expect(Facter.fact(:cassandraminorversion).value).to be(nil)
-      expect(Facter.fact(:cassandrapatchversion).value).to be(nil)
     end
+
+    it { expect(Facter.fact(:cassandrarelease).value).to be(nil) }
+    it { expect(Facter.fact(:cassandramajorversion).value).to be(nil) }
+    it { expect(Facter.fact(:cassandraminorversion).value).to be(nil) }
+    it { expect(Facter.fact(:cassandrapatchversion).value).to be(nil) }
   end
 end
diff --git a/spec/unit/facter/cassandrapatchversion_spec.rb b/spec/unit/facter/cassandrapatchversion_spec.rb
index 799d60d..2c1bdd6 100644
--- a/spec/unit/facter/cassandrapatchversion_spec.rb
+++ b/spec/unit/facter/cassandrapatchversion_spec.rb
@@ -1,43 +1,46 @@
 require 'spec_helper'
 
 describe 'Facter::Util::Fact' do
   before do
     Facter.clear
   end
 
   describe 'cassandrarelease DSE' do
     it do
       allow(Facter::Util::Resolution).
         to receive(:exec).with('nodetool version').
         and_return('2.1.11.969')
-      expect(Facter.fact(:cassandrarelease).value).to eql('2.1.11')
-      expect(Facter.fact(:cassandramajorversion).value).to be(2)
-      expect(Facter.fact(:cassandraminorversion).value).to be(1)
-      expect(Facter.fact(:cassandrapatchversion).value).to be(11)
     end
+
+    it { expect(Facter.fact(:cassandrarelease).value).to eql('2.1.11') }
+    it { expect(Facter.fact(:cassandramajorversion).value).to be(2) }
+    it { expect(Facter.fact(:cassandraminorversion).value).to be(1) }
+    it { expect(Facter.fact(:cassandrapatchversion).value).to be(11) }
   end
 
   describe 'cassandrarelease DDC' do
     it do
       allow(Facter::Util::Resolution).
         to receive(:exec).with('nodetool version').
         and_return('3.0.1')
-      expect(Facter.fact(:cassandrarelease).value).to eql('3.0.1')
-      expect(Facter.fact(:cassandramajorversion).value).to be(3)
-      expect(Facter.fact(:cassandraminorversion).value).to be(0)
-      expect(Facter.fact(:cassandrapatchversion).value).to be(1)
     end
+
+    it { expect(Facter.fact(:cassandrarelease).value).to eql('3.0.1') }
+    it { expect(Facter.fact(:cassandramajorversion).value).to be(3) }
+    it { expect(Facter.fact(:cassandraminorversion).value).to be(0) }
+    it { expect(Facter.fact(:cassandrapatchversion).value).to be(1) }
   end
 
   describe 'Cassandra not installed or not running' do
     it do
       allow(Facter::Util::Resolution).
         to receive(:exec).with('nodetool version').
         and_return('')
-      expect(Facter.fact(:cassandrarelease).value).to be(nil)
-      expect(Facter.fact(:cassandramajorversion).value).to be(nil)
-      expect(Facter.fact(:cassandraminorversion).value).to be(nil)
-      expect(Facter.fact(:cassandrapatchversion).value).to be(nil)
     end
+
+    it { expect(Facter.fact(:cassandrarelease).value).to be(nil) }
+    it { expect(Facter.fact(:cassandramajorversion).value).to be(nil) }
+    it { expect(Facter.fact(:cassandraminorversion).value).to be(nil) }
+    it { expect(Facter.fact(:cassandrapatchversion).value).to be(nil) }
   end
 end
diff --git a/spec/unit/facter/cassandrarelease_spec.rb b/spec/unit/facter/cassandrarelease_spec.rb
index 799d60d..2c1bdd6 100644
--- a/spec/unit/facter/cassandrarelease_spec.rb
+++ b/spec/unit/facter/cassandrarelease_spec.rb
@@ -1,43 +1,46 @@
 require 'spec_helper'
 
 describe 'Facter::Util::Fact' do
   before do
     Facter.clear
   end
 
   describe 'cassandrarelease DSE' do
     it do
       allow(Facter::Util::Resolution).
         to receive(:exec).with('nodetool version').
         and_return('2.1.11.969')
-      expect(Facter.fact(:cassandrarelease).value).to eql('2.1.11')
-      expect(Facter.fact(:cassandramajorversion).value).to be(2)
-      expect(Facter.fact(:cassandraminorversion).value).to be(1)
-      expect(Facter.fact(:cassandrapatchversion).value).to be(11)
     end
+
+    it { expect(Facter.fact(:cassandrarelease).value).to eql('2.1.11') }
+    it { expect(Facter.fact(:cassandramajorversion).value).to be(2) }
+    it { expect(Facter.fact(:cassandraminorversion).value).to be(1) }
+    it { expect(Facter.fact(:cassandrapatchversion).value).to be(11) }
   end
 
   describe 'cassandrarelease DDC' do
     it do
       allow(Facter::Util::Resolution).
         to receive(:exec).with('nodetool version').
         and_return('3.0.1')
-      expect(Facter.fact(:cassandrarelease).value).to eql('3.0.1')
-      expect(Facter.fact(:cassandramajorversion).value).to be(3)
-      expect(Facter.fact(:cassandraminorversion).value).to be(0)
-      expect(Facter.fact(:cassandrapatchversion).value).to be(1)
     end
+
+    it { expect(Facter.fact(:cassandrarelease).value).to eql('3.0.1') }
+    it { expect(Facter.fact(:cassandramajorversion).value).to be(3) }
+    it { expect(Facter.fact(:cassandraminorversion).value).to be(0) }
+    it { expect(Facter.fact(:cassandrapatchversion).value).to be(1) }
   end
 
   describe 'Cassandra not installed or not running' do
     it do
       allow(Facter::Util::Resolution).
         to receive(:exec).with('nodetool version').
         and_return('')
-      expect(Facter.fact(:cassandrarelease).value).to be(nil)
-      expect(Facter.fact(:cassandramajorversion).value).to be(nil)
-      expect(Facter.fact(:cassandraminorversion).value).to be(nil)
-      expect(Facter.fact(:cassandrapatchversion).value).to be(nil)
     end
+
+    it { expect(Facter.fact(:cassandrarelease).value).to be(nil) }
+    it { expect(Facter.fact(:cassandramajorversion).value).to be(nil) }
+    it { expect(Facter.fact(:cassandraminorversion).value).to be(nil) }
+    it { expect(Facter.fact(:cassandrapatchversion).value).to be(nil) }
   end
 end