diff --git a/spec/unit/facter/cassandracmsheapnewsize_spec.rb b/spec/unit/facter/cassandracmsheapnewsize_spec.rb
index f9f4ce2..36f8b2a 100644
--- a/spec/unit/facter/cassandracmsheapnewsize_spec.rb
+++ b/spec/unit/facter/cassandracmsheapnewsize_spec.rb
@@ -1,108 +1,48 @@
 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')
-    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')
-    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('')
-    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 'cassandracmsheapnewsize' do
+  before { Facter.clear }
+  after { Facter.clear }
 
   describe 'Heap settings' do
-    context 'Rasberry Pi 3' do
-      before do
+    describe 'Rasberry Pi 3' do
+      it do
         Facter.fact(:memorysize_mb).stubs(:value).returns('1024')
         Facter.fact(:processorcount).stubs(:value).returns('4')
+        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
+    describe 'm4.large' do
+      it do
         Facter.fact(:memorysize_mb).stubs(:value).returns('8191.9')
         Facter.fact(:processorcount).stubs(:value).returns('2')
+        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
+    describe 'm4.xlarge' do
+      it do
         Facter.fact(:memorysize_mb).stubs(:value).returns('16384')
         Facter.fact(:processorcount).stubs(:value).returns('2')
+        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
+    describe 'c4.2xlarge' do
+      it do
         Facter.fact(:memorysize_mb).stubs(:value).returns('15360')
         Facter.fact(:processorcount).stubs(:value).returns('8')
+        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
+    describe 'i2.2xlarge' do
+      it do
         Facter.fact(:memorysize_mb).stubs(:value).returns('62464')
         Facter.fact(:processorcount).stubs(:value).returns('8')
+        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 f9f4ce2..489e9f8 100644
--- a/spec/unit/facter/cassandracmsmaxheapsize_spec.rb
+++ b/spec/unit/facter/cassandracmsmaxheapsize_spec.rb
@@ -1,108 +1,48 @@
 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')
-    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')
-    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('')
-    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 'cassandracmsmaxheapsize' do
+  before { Facter.clear }
+  after { Facter.clear }
 
   describe 'Heap settings' do
-    context 'Rasberry Pi 3' do
-      before do
+    describe 'Rasberry Pi 3' do
+      it do
         Facter.fact(:memorysize_mb).stubs(:value).returns('1024')
         Facter.fact(:processorcount).stubs(:value).returns('4')
+        expect(Facter.fact(:cassandracmsmaxheapsize).value).to be(512)
       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
+    describe 'm4.large' do
+      it do
         Facter.fact(:memorysize_mb).stubs(:value).returns('8191.9')
         Facter.fact(:processorcount).stubs(:value).returns('2')
+        expect(Facter.fact(:cassandracmsmaxheapsize).value).to be(2048)
       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
+    describe 'm4.xlarge' do
+      it do
         Facter.fact(:memorysize_mb).stubs(:value).returns('16384')
         Facter.fact(:processorcount).stubs(:value).returns('2')
+        expect(Facter.fact(:cassandracmsmaxheapsize).value).to be(4096)
       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
+    describe 'c4.2xlarge' do
+      it do
         Facter.fact(:memorysize_mb).stubs(:value).returns('15360')
         Facter.fact(:processorcount).stubs(:value).returns('8')
+        expect(Facter.fact(:cassandracmsmaxheapsize).value).to be(3840)
       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
+    describe 'i2.2xlarge' do
+      it do
         Facter.fact(:memorysize_mb).stubs(:value).returns('62464')
         Facter.fact(:processorcount).stubs(:value).returns('8')
+        expect(Facter.fact(:cassandracmsmaxheapsize).value).to be(14_336)
       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 f9f4ce2..04af018 100644
--- a/spec/unit/facter/cassandraheapnewsize_spec.rb
+++ b/spec/unit/facter/cassandraheapnewsize_spec.rb
@@ -1,108 +1,48 @@
 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')
-    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')
-    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('')
-    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 'cassandraheapnewsize' do
+  before { Facter.clear }
+  after { Facter.clear }
 
   describe 'Heap settings' do
-    context 'Rasberry Pi 3' do
-      before do
+    describe 'Rasberry Pi 3' do
+      it do
         Facter.fact(:memorysize_mb).stubs(:value).returns('1024')
         Facter.fact(:processorcount).stubs(:value).returns('4')
+        expect(Facter.fact(:cassandraheapnewsize).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
+    describe 'm4.large' do
+      it do
         Facter.fact(:memorysize_mb).stubs(:value).returns('8191.9')
         Facter.fact(:processorcount).stubs(:value).returns('2')
+        expect(Facter.fact(:cassandraheapnewsize).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
+    describe 'm4.xlarge' do
+      it do
         Facter.fact(:memorysize_mb).stubs(:value).returns('16384')
         Facter.fact(:processorcount).stubs(:value).returns('2')
+        expect(Facter.fact(:cassandraheapnewsize).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
+    describe 'c4.2xlarge' do
+      it do
         Facter.fact(:memorysize_mb).stubs(:value).returns('15360')
         Facter.fact(:processorcount).stubs(:value).returns('8')
+        expect(Facter.fact(:cassandraheapnewsize).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
+    describe 'i2.2xlarge' do
+      it do
         Facter.fact(:memorysize_mb).stubs(:value).returns('62464')
         Facter.fact(:processorcount).stubs(:value).returns('8')
+        expect(Facter.fact(:cassandraheapnewsize).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 2c1bdd6..151c520 100644
--- a/spec/unit/facter/cassandramajorversion_spec.rb
+++ b/spec/unit/facter/cassandramajorversion_spec.rb
@@ -1,46 +1,27 @@
 require 'spec_helper'
 
-describe 'Facter::Util::Fact' do
-  before do
-    Facter.clear
-  end
+describe 'cassandramajorversion' do
+  before { Facter.clear }
+  after { Facter.clear }
 
   describe 'cassandrarelease DSE' do
     it do
-      allow(Facter::Util::Resolution).
-        to receive(:exec).with('nodetool version').
-        and_return('2.1.11.969')
+      Facter::Util::Resolution.stubs(:exec).with('nodetool version').returns('2.1.11.969')
+      expect(Facter.fact(:cassandramajorversion).value).to be(2)
     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')
+      Facter::Util::Resolution.stubs(:exec).with('nodetool version').returns('3.0.1')
+      expect(Facter.fact(:cassandramajorversion).value).to be(3)
     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('')
+      Facter::Util::Resolution.stubs(:exec).with('nodetool version').returns('')
+      expect(Facter.fact(:cassandramajorversion).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 f9f4ce2..135afb1 100644
--- a/spec/unit/facter/cassandramaxheapsize_spec.rb
+++ b/spec/unit/facter/cassandramaxheapsize_spec.rb
@@ -1,108 +1,48 @@
 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')
-    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')
-    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('')
-    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 ':cassandramaxheapsize' do
+  before { Facter.clear }
+  after { Facter.clear }
 
   describe 'Heap settings' do
-    context 'Rasberry Pi 3' do
-      before do
+    describe 'Rasberry Pi 3' do
+      it do
         Facter.fact(:memorysize_mb).stubs(:value).returns('1024')
         Facter.fact(:processorcount).stubs(:value).returns('4')
+        expect(Facter.fact(:cassandramaxheapsize).value).to eq(512)
       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
+    describe 'm4.large' do
+      it do
         Facter.fact(:memorysize_mb).stubs(:value).returns('8191.9')
         Facter.fact(:processorcount).stubs(:value).returns('2')
+        expect(Facter.fact(:cassandramaxheapsize).value).to be(2048)
       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
+    describe 'm4.xlarge' do
+      it do
         Facter.fact(:memorysize_mb).stubs(:value).returns('16384')
         Facter.fact(:processorcount).stubs(:value).returns('2')
+        expect(Facter.fact(:cassandramaxheapsize).value).to be(4096)
       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
+    describe 'c4.2xlarge' do
+      it do
         Facter.fact(:memorysize_mb).stubs(:value).returns('15360')
         Facter.fact(:processorcount).stubs(:value).returns('8')
+        expect(Facter.fact(:cassandramaxheapsize).value).to be(3840)
       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
+    describe 'i2.2xlarge' do
+      it do
         Facter.fact(:memorysize_mb).stubs(:value).returns('62464')
         Facter.fact(:processorcount).stubs(:value).returns('8')
+        expect(Facter.fact(:cassandramaxheapsize).value).to be(8192)
       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 2c1bdd6..575c184 100644
--- a/spec/unit/facter/cassandraminorversion_spec.rb
+++ b/spec/unit/facter/cassandraminorversion_spec.rb
@@ -1,46 +1,27 @@
 require 'spec_helper'
 
-describe 'Facter::Util::Fact' do
-  before do
-    Facter.clear
-  end
+describe 'cassandraminorversion' do
+  before { Facter.clear }
+  after { Facter.clear }
 
   describe 'cassandrarelease DSE' do
     it do
-      allow(Facter::Util::Resolution).
-        to receive(:exec).with('nodetool version').
-        and_return('2.1.11.969')
+      Facter::Util::Resolution.stubs(:exec).with('nodetool version').returns('2.1.11.969')
+      expect(Facter.fact(:cassandraminorversion).value).to be(1)
     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')
+      Facter::Util::Resolution.stubs(:exec).with('nodetool version').returns('3.0.1')
+      expect(Facter.fact(:cassandraminorversion).value).to be(0)
     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('')
+      Facter::Util::Resolution.stubs(:exec).with('nodetool version').returns('')
+      expect(Facter.fact(:cassandraminorversion).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 2c1bdd6..c85aaf8 100644
--- a/spec/unit/facter/cassandrapatchversion_spec.rb
+++ b/spec/unit/facter/cassandrapatchversion_spec.rb
@@ -1,46 +1,27 @@
 require 'spec_helper'
 
-describe 'Facter::Util::Fact' do
-  before do
-    Facter.clear
-  end
+describe 'cassandrapatchversion' do
+  before { Facter.clear }
+  after { Facter.clear }
 
   describe 'cassandrarelease DSE' do
     it do
-      allow(Facter::Util::Resolution).
-        to receive(:exec).with('nodetool version').
-        and_return('2.1.11.969')
+      Facter::Util::Resolution.stubs(:exec).with('nodetool version').returns('2.1.11.969')
+      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')
+      Facter::Util::Resolution.stubs(:exec).with('nodetool version').returns('3.0.1')
+      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('')
+      Facter::Util::Resolution.stubs(:exec).with('nodetool version').returns('')
+      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 2c1bdd6..98b1830 100644
--- a/spec/unit/facter/cassandrarelease_spec.rb
+++ b/spec/unit/facter/cassandrarelease_spec.rb
@@ -1,46 +1,27 @@
 require 'spec_helper'
 
-describe 'Facter::Util::Fact' do
-  before do
-    Facter.clear
-  end
+describe 'cassandrarelease' do
+  before { Facter.clear }
+  after { Facter.clear }
 
   describe 'cassandrarelease DSE' do
     it do
-      allow(Facter::Util::Resolution).
-        to receive(:exec).with('nodetool version').
-        and_return('2.1.11.969')
+      Facter::Util::Resolution.stubs(:exec).with('nodetool version').returns('2.1.11.969')
+      expect(Facter.fact(:cassandrarelease).value).to eql('2.1.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')
+      Facter::Util::Resolution.stubs(:exec).with('nodetool version').returns('3.0.1')
+      expect(Facter.fact(:cassandrarelease).value).to eql('3.0.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('')
+      Facter::Util::Resolution.stubs(:exec).with('nodetool version').returns('')
+      expect(Facter.fact(:cassandrarelease).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