diff --git a/spec/models/benchmark_model_spec.rb b/spec/models/benchmark_model_spec.rb
index df8ebe7..feda84c 100644
--- a/spec/models/benchmark_model_spec.rb
+++ b/spec/models/benchmark_model_spec.rb
@@ -5,20 +5,22 @@ require_relative '../spec_helper'
 RSpec.describe(Benchmark) do
   describe 'Benchmark Creation' do
     it 'Benchmark creation updates model count.' do
-      expect{ Benchmark.create(name: 'Test Benchmark', scoring: 'fps') }.to(change { Benchmark.count }.by(1))
+      expect do
+        described_class.create(name: 'Test Benchmark', scoring: 'fps')
+      end.to(change(described_class, :count).by(1))
     end
   end
 
   describe 'Benchmark Read' do
-    before { Benchmark.create(name: 'Test Benchmark', scoring: 'fps') }
+    before { described_class.create(name: 'Test Benchmark', scoring: 'fps') }
 
     it 'Benchmark model has name.' do
-      bench = Benchmark.first()
+      bench = described_class.first()
       expect(bench.name).to(eq('Test Benchmark'))
     end
 
     it 'Benchmark model has scoring.' do
-      bench = Benchmark.first()
+      bench = described_class.first()
       expect(bench.scoring).to(eq('fps'))
     end
   end
diff --git a/spec/models/hardware_model_spec.rb b/spec/models/hardware_model_spec.rb
index 4681a22..5bc744a 100644
--- a/spec/models/hardware_model_spec.rb
+++ b/spec/models/hardware_model_spec.rb
@@ -5,20 +5,20 @@ require_relative '../spec_helper'
 RSpec.describe(Hardware) do
   describe 'Hardware Creation' do
     it 'Hardware creation updates model count.' do
-      expect{ Hardware.create(name: 'Test Hardware', type: 'gpu') }.to(change { Hardware.count }.by(1))
+      expect { described_class.create(name: 'Test Hardware', type: 'gpu') }.to(change(described_class, :count).by(1))
     end
   end
 
   describe 'Hardware Read' do
-    before { Hardware.create(name: 'Test Hardware', type: 'gpu') }
+    before { described_class.create(name: 'Test Hardware', type: 'gpu') }
 
     it 'Hardware model has name.' do
-      hardware = Hardware.first()
+      hardware = described_class.first()
       expect(hardware.name).to(eq('Test Hardware'))
     end
 
     it 'Hardware model has scoring.' do
-      hardware = Hardware.first()
+      hardware = described_class.first()
       expect(hardware.type).to(eq('gpu'))
     end
   end
diff --git a/spec/models/test_model_spec.rb b/spec/models/test_model_spec.rb
index bb0245d..d43c3a2 100644
--- a/spec/models/test_model_spec.rb
+++ b/spec/models/test_model_spec.rb
@@ -5,17 +5,17 @@ require_relative '../spec_helper'
 RSpec.describe(Test) do
   describe 'Test Creation' do
     it 'Test creation updates model count.' do
-      expect{ Test.create(name: 'Test Test') }.to(change { Test.count }.by(1))
+      expect { described_class.create(name: 'Test Test') }.to(change(described_class, :count).by(1))
     end
   end
 
   describe 'Test Read' do
     before do
-      Test.create(name: 'Test Test')
+      described_class.create(name: 'Test Test')
     end
 
     it 'Test model has name.' do
-      tst = Test.first()
+      tst = described_class.first()
       expect(tst.name).to(eq('Test Test'))
     end
   end
@@ -23,13 +23,13 @@ RSpec.describe(Test) do
   describe 'Test one-to-many association with Hardware' do
     it 'Test model has Hardware associated with it.' do
       hardware = Hardware.create(name: 'Test Hardware', type: 'gpu')
-      tst = Test.create(name: 'Test Test', hardware_id: hardware.id)
+      tst = described_class.create(name: 'Test Test', hardware_id: hardware.id)
       expect(tst.hardware).to(eq(hardware))
     end
 
     it 'Test model\'s hardware has name set.' do
       hardware = Hardware.create(name: 'Test Hardware', type: 'gpu')
-      tst = Test.create(name: 'Test Test', hardware_id: hardware.id)
+      tst = described_class.create(name: 'Test Test', hardware_id: hardware.id)
       expect(tst.hardware.name).to(eq('Test Hardware'))
     end
   end
diff --git a/spec/spec_helper.rb b/spec/spec_helper.rb
index 5306757..56d49b2 100644
--- a/spec/spec_helper.rb
+++ b/spec/spec_helper.rb
@@ -27,7 +27,7 @@ RSpec.configure do |config|
     DatabaseCleaner.strategy = :transaction
   end
 
-  config.around(:each) do |suite|
+  config.around do |suite|
     DatabaseCleaner.cleaning do
       suite.run
     end