diff --git a/spec/beaker/hypervisor/vmpooler_spec.rb b/spec/beaker/hypervisor/vmpooler_spec.rb
index 42d916a..6e15662 100644
--- a/spec/beaker/hypervisor/vmpooler_spec.rb
+++ b/spec/beaker/hypervisor/vmpooler_spec.rb
@@ -143,14 +143,14 @@ module Beaker
     describe "#cleanup" do
 
       it "cleans up hosts in the pool" do
-        mock_http = MockNet::HTTP.new("host", "port")
+        mock_http = MockNet::HTTP.new( "host", "port" )
         vmpooler = Beaker::Vmpooler.new( make_hosts, make_opts )
         vmpooler.provision
         vm_count = vmpooler.instance_variable_get( :@hosts ).count
 
-        expect( Net::HTTP ).to receive( :new ).exactly(vm_count).times.and_return( mock_http )
-        expect( mock_http ).to receive( :request ).exactly(vm_count).times
-        expect( Net::HTTP::Delete ).to receive( :new ).exactly(vm_count).times
+        expect( Net::HTTP ).to receive( :new ).exactly( vm_count ).times.and_return( mock_http )
+        expect( mock_http ).to receive( :request ).exactly( vm_count ).times
+        expect( Net::HTTP::Delete ).to receive( :new ).exactly( vm_count ).times
         expect{ vmpooler.cleanup }.to_not raise_error
       end
     end
@@ -159,10 +159,6 @@ module Beaker
   describe Vmpooler do
 
     before :each do
-      vms = make_hosts()
-      MockVsphereHelper.set_config( fog_file_contents )
-      MockVsphereHelper.set_vms( vms )
-      stub_const( "VsphereHelper", MockVsphereHelper )
       stub_const( "Net", MockNet )
       allow( JSON ).to receive( :parse ) do |arg|
         arg