diff --git a/lib/fog/aws/simpledb.rb b/lib/fog/aws/simpledb.rb
index 50dd75ab7..20b85af5d 100644
--- a/lib/fog/aws/simpledb.rb
+++ b/lib/fog/aws/simpledb.rb
@@ -26,14 +26,13 @@ module Fog
           end
         end
 
-        def self.reset_data(keys=data.keys)
-          for key in [*keys]
-            data.delete(key)
-          end
-        end
-
         def initialize(options={})
           @aws_access_key_id = options[:aws_access_key_id]
+          reset_data
+        end
+
+        def reset_data
+          self.class.data.delete(@aws_access_key_id)
           @data = self.class.data[@aws_access_key_id]
         end
 
diff --git a/lib/fog/cdn/aws.rb b/lib/fog/cdn/aws.rb
index 6585a2789..59d4b03d3 100644
--- a/lib/fog/cdn/aws.rb
+++ b/lib/fog/cdn/aws.rb
@@ -28,12 +28,6 @@ module Fog
           end
         end
 
-        def self.reset_data(keys=data.keys)
-          for key in [*keys]
-            data.delete(key)
-          end
-        end
-
         def initialize(options={})
           unless options.delete(:provider)
             location = caller.first
@@ -43,13 +37,20 @@ module Fog
           end
 
           require 'mime/types'
-          @aws_access_key_id = options[:aws_access_key_id]
-          @data = self.class.data[options[:region]][@aws_access_key_id]
+          @aws_access_key_id  = options[:aws_access_key_id]
+          @region             = options[:region]
+          reset_data
+        end
+
+        def reset_data
+          self.class.data[@region].delete(@aws_access_key_id)
+          @data = self.class.data[@region][@aws_access_key_id]
         end
 
         def signature(params)
           "foo"
         end
+
       end
 
       class Real
diff --git a/lib/fog/cdn/rackspace.rb b/lib/fog/cdn/rackspace.rb
index 854d0d269..903c0493f 100644
--- a/lib/fog/cdn/rackspace.rb
+++ b/lib/fog/cdn/rackspace.rb
@@ -22,12 +22,6 @@ module Fog
           end
         end
 
-        def self.reset_data(keys=data.keys)
-          for key in [*keys]
-            data.delete(key)
-          end
-        end
-
         def initialize(options={})
           unless options.delete(:provider)
             location = caller.first
@@ -37,6 +31,11 @@ module Fog
           end
 
           @rackspace_username = options[:rackspace_username]
+          reset_data
+        end
+
+        def reset_data
+          self.class.data.delete(@rackspace_username)
           @data = self.class.data[@rackspace_username]
         end
 
diff --git a/lib/fog/compute/aws.rb b/lib/fog/compute/aws.rb
index 5965d6513..7f0e90a4a 100644
--- a/lib/fog/compute/aws.rb
+++ b/lib/fog/compute/aws.rb
@@ -134,8 +134,13 @@ module Fog
 
           @aws_access_key_id = options[:aws_access_key_id]
           @region = options[:region] || 'us-east-1'
-          @data = self.class.data[@region][@aws_access_key_id]
           @owner_id = @data[:owner_id]
+          reset_data
+        end
+
+        def reset_data
+          self.class.data[@region].delete(@aws_access_key_id)
+          @data = self.class.data[@region][@aws_access_key_id]
         end
 
       end
diff --git a/lib/fog/compute/bluebox.rb b/lib/fog/compute/bluebox.rb
index 176210c44..8261e079e 100644
--- a/lib/fog/compute/bluebox.rb
+++ b/lib/fog/compute/bluebox.rb
@@ -33,12 +33,6 @@ module Fog
           end
         end
 
-        def self.reset_data(keys=data.keys)
-          for key in [*keys]
-            data.delete(key)
-          end
-        end
-
         def initialize(options={})
           unless options.delete(:provider)
             location = caller.first
@@ -48,6 +42,11 @@ module Fog
           end
 
           @bluebox_api_key = options[:bluebox_api_key]
+          reset_data
+        end
+
+        def reset_data
+          self.class.data.delete(@bluebox_api_key)
           @data = self.class.data[@bluebox_api_key]
         end
 
diff --git a/lib/fog/compute/go_grid.rb b/lib/fog/compute/go_grid.rb
index c1f25a39f..be5545d67 100644
--- a/lib/fog/compute/go_grid.rb
+++ b/lib/fog/compute/go_grid.rb
@@ -36,12 +36,6 @@ module Fog
           end
         end
 
-        def self.reset_data(keys=data.keys)
-          for key in [*keys]
-            data.delete(key)
-          end
-        end
-
         def initialize(options={})
           unless options.delete(:provider)
             location = caller.first
@@ -52,6 +46,11 @@ module Fog
 
           @go_grid_api_key = options[:go_grid_api_key]
           @go_grid_shared_secret = options[:go_grid_shared_secret]
+          reset_data
+        end
+
+        def reset_data
+          self.class.data.delete(@go_grid_api_key)
           @data = self.class.data[@go_grid_api_key]
         end
 
diff --git a/lib/fog/compute/linode.rb b/lib/fog/compute/linode.rb
index 3bd256ec2..ee8d1c127 100644
--- a/lib/fog/compute/linode.rb
+++ b/lib/fog/compute/linode.rb
@@ -31,12 +31,6 @@ module Fog
           end
         end
 
-        def self.reset_data(keys=data.keys)
-          for key in [*keys]
-            data.delete(key)
-          end
-        end
-
         def initialize(options={})
           unless options.delete(:provider)
             location = caller.first
@@ -46,6 +40,11 @@ module Fog
           end
 
           @linode_api_key = options[:linode_api_key]
+          reset_data
+        end
+
+        def reset_data
+          self.class.data.delete(@linode_api_key)
           @data = self.class.data[@linode_api_key]
         end
 
diff --git a/lib/fog/compute/new_servers.rb b/lib/fog/compute/new_servers.rb
index 16dad5dfe..154df7f6b 100644
--- a/lib/fog/compute/new_servers.rb
+++ b/lib/fog/compute/new_servers.rb
@@ -25,12 +25,6 @@ module Fog
           end
         end
 
-        def self.reset_data(keys=data.keys)
-          for key in [*keys]
-            data.delete(key)
-          end
-        end
-
         def initialize(options={})
           unless options.delete(:provider)
             location = caller.first
@@ -40,6 +34,11 @@ module Fog
           end
 
           @new_server_username = options[:new_servers_username]
+          reset_data
+        end
+
+        def reset_data
+          self.class.data.delete(@new_server_username)
           @data = self.class.data[@new_server_username]
         end
 
diff --git a/lib/fog/compute/rackspace.rb b/lib/fog/compute/rackspace.rb
index d4f5d4f03..bdd73f6d3 100644
--- a/lib/fog/compute/rackspace.rb
+++ b/lib/fog/compute/rackspace.rb
@@ -53,12 +53,6 @@ module Fog
           end
         end
 
-        def self.reset_data(keys=data.keys)
-          for key in [*keys]
-            data.delete(key)
-          end
-        end
-
         def initialize(options={})
           unless options.delete(:provider)
             location = caller.first
@@ -68,6 +62,11 @@ module Fog
           end
 
           @rackspace_username = options[:rackspace_username]
+          reset_data
+        end
+
+        def reset_data
+          self.class.data.delete(@rackspace_username)
           @data = self.class.data[@rackspace_username]
         end
 
diff --git a/lib/fog/compute/slicehost.rb b/lib/fog/compute/slicehost.rb
index 30e81b6be..08d9c83e2 100644
--- a/lib/fog/compute/slicehost.rb
+++ b/lib/fog/compute/slicehost.rb
@@ -34,12 +34,6 @@ module Fog
           end
         end
 
-        def self.reset_data(keys=data.keys)
-          for key in [*keys]
-            data.delete(key)
-          end
-        end
-
         def initialize(options={})
           unless options.delete(:provider)
             location = caller.first
@@ -49,6 +43,11 @@ module Fog
           end
 
           @slicehost_password = options[:slicehost_password]
+          reset_data
+        end
+
+        def reset_data
+          self.class.data.delete(@slicehost_password)
           @data = self.class.data[@slicehost_password]
         end
 
diff --git a/lib/fog/compute/voxel.rb b/lib/fog/compute/voxel.rb
index 37c545936..6ddf60abe 100644
--- a/lib/fog/compute/voxel.rb
+++ b/lib/fog/compute/voxel.rb
@@ -23,38 +23,41 @@ module Fog
         include Collections
 
         def self.data
-          @data ||= {
-            :last_modified => { :servers => {}, :statuses => {}, :images => {} },
-            :servers => [],
-            :statuses => {},
-            :images  => [
-              {'id' => 1,   'name' => "CentOS 4, 32-bit, base install"},
-              {'id' => 2,   'name' => "CentOS 4, 64-bit, base install"},
-              {'id' => 3,   'name' => "CentOS 5, 32-bit, base install"},
-              {'id' => 4,   'name' => "CentOS 5, 64-bit, base install"},
-              {'id' => 7,   'name' => "Fedora 10, 32-bit, base install"},
-              {'id' => 8,   'name' => "Fedora 10, 64-bit, base install"},
-              {'id' => 10,  'name' => "OpenSUSE 11, 64-bit, base install"},
-              {'id' => 11,  'name' => "Debian 5.0 \"lenny\", 32-bit, base install"},
-              {'id' => 12,  'name' => "Debian 5.0 \"lenny\", 64-bit, base install"},
-              {'id' => 13,  'name' => "Ubuntu 8.04 \"Hardy\", 32-bit, base install"},
-              {'id' => 14,  'name' => "Ubuntu 8.04 \"Hardy\", 64-bit, base install"},
-              {'id' => 15,  'name' => "Voxel Server Environment (VSE), 32-bit, base install"},
-              {'id' => 16,  'name' => "Voxel Server Environment (VSE), 64-bit, base install"},
-              {'id' => 32,  'name' => "Pantheon Official Mercury Stack for Drupal (based on VSE/64)"},
-              {'id' => 55,  'name' => "Ubuntu 10.04 \"Lucid\", 64-bit, base install"} ]
-        }
-        end
-
-        def self.reset_data(keys=data.keys)
-          for key in [*keys]
-            data.delete(key)
+          @data ||= Hash.new do |hash, key|
+            hash[key] = {
+              :last_modified => { :servers => {}, :statuses => {}, :images => {} },
+              :servers => [],
+              :statuses => {},
+              :images  => [
+                {'id' => 1,   'name' => "CentOS 4, 32-bit, base install"},
+                {'id' => 2,   'name' => "CentOS 4, 64-bit, base install"},
+                {'id' => 3,   'name' => "CentOS 5, 32-bit, base install"},
+                {'id' => 4,   'name' => "CentOS 5, 64-bit, base install"},
+                {'id' => 7,   'name' => "Fedora 10, 32-bit, base install"},
+                {'id' => 8,   'name' => "Fedora 10, 64-bit, base install"},
+                {'id' => 10,  'name' => "OpenSUSE 11, 64-bit, base install"},
+                {'id' => 11,  'name' => "Debian 5.0 \"lenny\", 32-bit, base install"},
+                {'id' => 12,  'name' => "Debian 5.0 \"lenny\", 64-bit, base install"},
+                {'id' => 13,  'name' => "Ubuntu 8.04 \"Hardy\", 32-bit, base install"},
+                {'id' => 14,  'name' => "Ubuntu 8.04 \"Hardy\", 64-bit, base install"},
+                {'id' => 15,  'name' => "Voxel Server Environment (VSE), 32-bit, base install"},
+                {'id' => 16,  'name' => "Voxel Server Environment (VSE), 64-bit, base install"},
+                {'id' => 32,  'name' => "Pantheon Official Mercury Stack for Drupal (based on VSE/64)"},
+                {'id' => 55,  'name' => "Ubuntu 10.04 \"Lucid\", 64-bit, base install"} ]
+            }
           end
         end
 
         def initialize(options={})
-          @data = self.class.data
+          @voxel_api_key = options[:voxel_api_key]
+          reset_data
         end
+
+        def reset_data
+          self.class.data.delete(@voxel_api_key)
+          @data = self.class.data[@voxel_api_key]
+        end
+
       end
 
       class Real
diff --git a/lib/fog/core/scp.rb b/lib/fog/core/scp.rb
index b9963a112..37ceba5e0 100644
--- a/lib/fog/core/scp.rb
+++ b/lib/fog/core/scp.rb
@@ -9,10 +9,6 @@ module Fog
       end
     end
 
-    def self.reset_data(keys=Mock.data.keys)
-      Mock.reset_data(keys)
-    end
-
     class Mock
 
       def self.data
diff --git a/lib/fog/core/service.rb b/lib/fog/core/service.rb
index d8268b607..9d187abec 100644
--- a/lib/fog/core/service.rb
+++ b/lib/fog/core/service.rb
@@ -146,14 +146,6 @@ module Fog
         @recognized ||= []
       end
 
-      def reset_data(keys=Mock.data.keys)
-        Mock.reset_data(keys)
-      end
-
-      def reset_data(keys=Mock.data.keys)
-        Mock.reset_data(keys)
-      end
-
       def validate_options(options)
         missing = requirements - options.keys
         unless missing.empty?
diff --git a/lib/fog/core/ssh.rb b/lib/fog/core/ssh.rb
index f3812369f..af8b11b56 100644
--- a/lib/fog/core/ssh.rb
+++ b/lib/fog/core/ssh.rb
@@ -9,10 +9,6 @@ module Fog
       end
     end
 
-    def self.reset_data(keys=Mock.data.keys)
-      Mock.reset_data(keys)
-    end
-
     class Mock
 
       def self.data
diff --git a/lib/fog/dns/aws.rb b/lib/fog/dns/aws.rb
index 0abcdbcd3..74becb38f 100644
--- a/lib/fog/dns/aws.rb
+++ b/lib/fog/dns/aws.rb
@@ -33,12 +33,6 @@ module Fog
           end
         end
 
-        def self.reset_data(keys=data.keys)
-          for key in [*keys]
-            data.delete(key)
-          end
-        end
-
         def initialize(options={})
           unless options.delete(:provider)
             location = caller.first
@@ -48,8 +42,14 @@ module Fog
           end
 
           require 'mime/types'
-          @aws_access_key_id = options[:aws_access_key_id]
-          @data = self.class.data[options[:region]][@aws_access_key_id]
+          @aws_access_key_id  = options[:aws_access_key_id]
+          @region             = options[:region]
+          reset_data
+        end
+
+        def reset_data
+          self.class.data[@region].delete(@aws_access_key_id)
+          @data = self.class.data[@region][@aws_access_key_id]
         end
 
         def signature(params)
diff --git a/lib/fog/dns/bluebox.rb b/lib/fog/dns/bluebox.rb
index 24eb7a086..28b7ccb8f 100644
--- a/lib/fog/dns/bluebox.rb
+++ b/lib/fog/dns/bluebox.rb
@@ -30,12 +30,6 @@ module Fog
           end
         end
 
-        def self.reset_data(keys=data.keys)
-          for key in [*keys]
-            data.delete(key)
-          end
-        end
-
         def initialize(options={})
           unless options.delete(:provider)
             location = caller.first
@@ -46,8 +40,12 @@ module Fog
 
           @bluebox_customer_id = options[:bluebox_customer_id]
           @bluebox_api_key = options[:bluebox_api_key]
+          reset_data
+        end
+
+        def reset_data
+          self.class.data.delete(@bluebox_customer_id)
           @data = self.class.data[@bluebox_customer_id]
-          @data = self.class.data[@bluebox_api_key]
         end
       end
 
diff --git a/lib/fog/dns/dnsimple.rb b/lib/fog/dns/dnsimple.rb
index f05c8b791..7cd576de2 100644
--- a/lib/fog/dns/dnsimple.rb
+++ b/lib/fog/dns/dnsimple.rb
@@ -30,12 +30,6 @@ module Fog
           end
         end
 
-        def self.reset_data(keys=data.keys)
-          for key in [*keys]
-            data.delete(key)
-          end
-        end
-
         def initialize(options={})
           unless options.delete(:provider)
             location = caller.first
@@ -47,8 +41,13 @@ module Fog
           @dnsimple_email = options[:dnsimple_email]
           @dnsimple_password  = options[:dnsimple_password]
           @data = self.class.data[@dnsimple_email]
-          @data = self.class.data[@dnsimple_password]
         end
+
+        def reset_data
+          self.class.data.delete(@dnsimple_email)
+          @data = self.class.data[@dnsimple_email]
+        end
+
       end
 
       class Real
diff --git a/lib/fog/dns/linode.rb b/lib/fog/dns/linode.rb
index a605b50b7..303729b7a 100644
--- a/lib/fog/dns/linode.rb
+++ b/lib/fog/dns/linode.rb
@@ -30,12 +30,6 @@ module Fog
           end
         end
 
-        def self.reset_data(keys=data.keys)
-          for key in [*keys]
-            data.delete(key)
-          end
-        end
-
         def initialize(options={})
           unless options.delete(:provider)
             location = caller.first
@@ -45,6 +39,11 @@ module Fog
           end
 
           @linode_api_key = options[:linode_api_key]
+          reset_data
+        end
+
+        def reset_data
+          self.class.data.delete(@linode_api_key)
           @data = self.class.data[@linode_api_key]
         end
 
diff --git a/lib/fog/dns/slicehost.rb b/lib/fog/dns/slicehost.rb
index 103a4205b..0eeb28e9c 100644
--- a/lib/fog/dns/slicehost.rb
+++ b/lib/fog/dns/slicehost.rb
@@ -30,12 +30,6 @@ module Fog
           end
         end
 
-        def self.reset_data(keys=data.keys)
-          for key in [*keys]
-            data.delete(key)
-          end
-        end
-
         def initialize(options={})
           unless options.delete(:provider)
             location = caller.first
@@ -45,6 +39,11 @@ module Fog
           end
 
           @slicehost_password = options[:slicehost_password]
+          reset_data
+        end
+
+        def reset_data
+          self.class.data.delete(@slicehost_password)
           @data = self.class.data[@slicehost_password]
         end
 
diff --git a/lib/fog/dns/zerigo.rb b/lib/fog/dns/zerigo.rb
index 7a1342194..fc00d2f7e 100644
--- a/lib/fog/dns/zerigo.rb
+++ b/lib/fog/dns/zerigo.rb
@@ -36,12 +36,6 @@ module Fog
           end
         end
 
-        def self.reset_data(keys=data.keys)
-          for key in [*keys]
-            data.delete(key)
-          end
-        end
-
         def initialize(options={})
           unless options.delete(:provider)
             location = caller.first
@@ -52,8 +46,12 @@ module Fog
 
           @zerigo_email = options[:zerigo_email]
           @zerigo_token = options[:zerigo_token]
+          reset_data
+        end
+
+        def reset_data
+          self.class.data.delete(@zerigo_email)
           @data = self.class.data[@zerigo_email]
-          @data = self.class.data[@zerigo_password]
         end
 
       end
diff --git a/lib/fog/storage/aws.rb b/lib/fog/storage/aws.rb
index 9a695b433..2e852cfca 100644
--- a/lib/fog/storage/aws.rb
+++ b/lib/fog/storage/aws.rb
@@ -169,12 +169,6 @@ module Fog
           end
         end
 
-        def self.reset_data(keys=data.keys)
-          for key in [*keys]
-            data.delete(key)
-          end
-        end
-
         def initialize(options={})
           unless options.delete(:provider)
             location = caller.first
@@ -201,12 +195,19 @@ module Fog
           else
             raise ArgumentError, "Unknown region: #{options[:region].inspect}"
           end
-          @data = self.class.data[options[:region]][@aws_access_key_id]
+          @region = options[:region]
+          reset_data
+        end
+
+        def reset_data
+          self.class.data[@region].delete(@aws_access_key_id)
+          @data = self.class.data[@region][@aws_access_key_id]
         end
 
         def signature(params)
           "foo"
         end
+
       end
 
       class Real
diff --git a/lib/fog/storage/google.rb b/lib/fog/storage/google.rb
index c21756499..b6a0a0642 100644
--- a/lib/fog/storage/google.rb
+++ b/lib/fog/storage/google.rb
@@ -140,12 +140,6 @@ module Fog
           end
         end
 
-        def self.reset_data(keys=data.keys)
-          for key in [*keys]
-            data.delete(key)
-          end
-        end
-
         def initialize(options={})
           unless options.delete(:provider)
             location = caller.first
@@ -156,12 +150,18 @@ module Fog
 
           require 'mime/types'
           @google_storage_access_key_id = options[:google_storage_access_key_id]
+          reset_data
+        end
+
+        def reset_data
+          self.class.data.delete(@google_storage_access_key_id)
           @data = self.class.data[@google_storage_access_key_id]
         end
 
         def signature(params)
           "foo"
         end
+
       end
 
     
diff --git a/lib/fog/storage/local.rb b/lib/fog/storage/local.rb
index 9ae0db028..4aaba96bc 100644
--- a/lib/fog/storage/local.rb
+++ b/lib/fog/storage/local.rb
@@ -19,12 +19,6 @@ module Fog
           end
         end
 
-        def self.reset_data(keys=data.keys)
-          for key in [*keys]
-            data.delete(key)
-          end
-        end
-
         def initialize(options={})
           Fog::Mock.not_implemented
 
@@ -37,7 +31,7 @@ module Fog
           end
 
           @local_root = ::File.expand_path(options[:local_root])
-          @data       = self.class.data[@local_root]
+          reset_data
         end
 
         def local_root
@@ -47,6 +41,12 @@ module Fog
         def path_to(partial)
           ::File.join(@local_root, partial)
         end
+
+        def reset_data
+          self.class.data.delete(@local_root)
+          @data = self.class.data[@local_root]
+        end
+
       end
 
       class Real
diff --git a/lib/fog/storage/rackspace.rb b/lib/fog/storage/rackspace.rb
index 1eab8c12c..814c5b6c9 100644
--- a/lib/fog/storage/rackspace.rb
+++ b/lib/fog/storage/rackspace.rb
@@ -66,12 +66,6 @@ module Fog
           end
         end
 
-        def self.reset_data(keys=data.keys)
-          for key in [*keys]
-            data.delete(key)
-          end
-        end
-
         def initialize(options={})
           unless options.delete(:provider)
             location = caller.first
@@ -83,6 +77,11 @@ module Fog
           require 'mime/types'
           @rackspace_api_key = options[:rackspace_api_key]
           @rackspace_username = options[:rackspace_username]
+          reset_data
+        end
+
+        def reset_data
+          self.class.data.delete(@rackspace_username)
           @data = self.class.data[@rackspace_username]
         end