diff --git a/lib/geocoder/lookups/bing.rb b/lib/geocoder/lookups/bing.rb
index 0286012383cc1b919c323a8d7bfe906862536658..ce305f5d8e4e8ede37830e3c5b5f177cb0502256 100644
--- a/lib/geocoder/lookups/bing.rb
+++ b/lib/geocoder/lookups/bing.rb
@@ -58,7 +58,7 @@ module Geocoder::Lookup
 
     def check_response_for_errors!(response)
       super
-      if response.headers['X-MS-BM-WS-INFO'] == 1
+      if response['x-ms-bm-ws-info'].to_i == 1
         # Occasionally, the servers processing service requests can be overloaded, 
         # and you may receive some responses that contain no results for queries that 
         # you would normally receive a result. To identify this situation, 
diff --git a/test/test_helper.rb b/test/test_helper.rb
index e00638beeb0fd9433c6d6336cc456ff54b166552..6b8fac8918609a27893e35ab9b0e7ca2ba91364e 100644
--- a/test/test_helper.rb
+++ b/test/test_helper.rb
@@ -124,7 +124,7 @@ module Geocoder
         if file == "bing_service_unavailable"
           filepath = File.join("test", "fixtures", file)
           s = File.read(filepath).strip.gsub(/\n\s*/, "")
-          MockHttpResponse.new(body: s, code: "200", headers: {'X-MS-BM-WS-INFO' => 1})
+          MockHttpResponse.new(body: s, code: "200", headers: {'x-ms-bm-ws-info' => "1"})
         else
           super
         end
@@ -424,7 +424,7 @@ class GeocoderTestCase < Test::Unit::TestCase
 end
 
 class MockHttpResponse
-  attr_reader :code, :body, :headers
+  attr_reader :code, :body
   def initialize(options = {})
     @code = options[:code].to_s
     @body = options[:body]
@@ -432,6 +432,6 @@ class MockHttpResponse
   end
 
   def [](key)
-    send key if respond_to?(key)
+    @headers[key]
   end
 end