diff --git a/lib/fog/rackspace/models/queues/queue.rb b/lib/fog/rackspace/models/queues/queue.rb
index 6c81ac7bd..798ca2e02 100644
--- a/lib/fog/rackspace/models/queues/queue.rb
+++ b/lib/fog/rackspace/models/queues/queue.rb
@@ -37,7 +37,7 @@ module Fog
         end
 
         #Helper method to claim (dequeue) a single message, including destroying it
-        def dequeue(ttl, grace, options = {})
+        def dequeue(ttl, grace, options = {}, &block)
           claim = claims.create(
             options.merge(
             {
diff --git a/tests/rackspace/models/queues/claim_tests.rb b/tests/rackspace/models/queues/claim_tests.rb
index f3669e31d..2203bc53d 100644
--- a/tests/rackspace/models/queues/claim_tests.rb
+++ b/tests/rackspace/models/queues/claim_tests.rb
@@ -2,7 +2,7 @@ Shindo.tests('Fog::Rackspace::Queues | claim', ['rackspace']) do
 
   pending if Fog.mocking?
 
-  service = Fog::Rackspace::Queues.new
+  service = Fog::Rackspace::Queues.new(:rackspace_queues_client_id => 'test_client')
   queue = service.queues.create({
     :name => "fog_queue_#{Time.now.to_i.to_s}",
   })
diff --git a/tests/rackspace/models/queues/claims_tests.rb b/tests/rackspace/models/queues/claims_tests.rb
index 47ba9d5de..05e6907ad 100644
--- a/tests/rackspace/models/queues/claims_tests.rb
+++ b/tests/rackspace/models/queues/claims_tests.rb
@@ -2,7 +2,7 @@ Shindo.tests('Fog::Rackspace::Queues | claims', ['rackspace']) do
 
   pending if Fog.mocking?
 
-  service = Fog::Rackspace::Queues.new
+  service = Fog::Rackspace::Queues.new(:rackspace_queues_client_id => 'test_client')
   queue = service.queues.create({
     :name => "fog_queue_#{Time.now.to_i.to_s}",
   })
diff --git a/tests/rackspace/models/queues/message_tests.rb b/tests/rackspace/models/queues/message_tests.rb
index 347aae4ff..35131e896 100644
--- a/tests/rackspace/models/queues/message_tests.rb
+++ b/tests/rackspace/models/queues/message_tests.rb
@@ -2,7 +2,7 @@ Shindo.tests('Fog::Rackspace::Queues | message', ['rackspace']) do
 
   pending if Fog.mocking?
 
-  service = Fog::Rackspace::Queues.new
+  service = Fog::Rackspace::Queues.new(:rackspace_queues_client_id => 'test_client')
   queue = service.queues.create({
     :name => "fog_instance_#{Time.now.to_i.to_s}",
   })
diff --git a/tests/rackspace/models/queues/messages_tests.rb b/tests/rackspace/models/queues/messages_tests.rb
index ab5bb8796..95d4439fc 100644
--- a/tests/rackspace/models/queues/messages_tests.rb
+++ b/tests/rackspace/models/queues/messages_tests.rb
@@ -2,7 +2,7 @@ Shindo.tests('Fog::Rackspace::Queues | messages', ['rackspace']) do
 
   pending if Fog.mocking?
 
-  service = Fog::Rackspace::Queues.new
+  service = Fog::Rackspace::Queues.new(:rackspace_queues_client_id => 'test_client')
   queue = service.queues.create({
     :name => "fog_queue_#{Time.now.to_i.to_s}",
   })
diff --git a/tests/rackspace/models/queues/queue_tests.rb b/tests/rackspace/models/queues/queue_tests.rb
index b51b72be1..d5de67ae4 100644
--- a/tests/rackspace/models/queues/queue_tests.rb
+++ b/tests/rackspace/models/queues/queue_tests.rb
@@ -2,7 +2,7 @@ Shindo.tests('Fog::Rackspace::Queues | queue', ['rackspace']) do
 
   pending if Fog.mocking?
 
-  service = Fog::Rackspace::Queues.new
+  service = Fog::Rackspace::Queues.new(:rackspace_queues_client_id => 'test_client')
   options = {
     :name => "fog_instance_#{Time.now.to_i.to_s}",
   }
diff --git a/tests/rackspace/models/queues/queues_tests.rb b/tests/rackspace/models/queues/queues_tests.rb
index 15970aade..a90cfc857 100644
--- a/tests/rackspace/models/queues/queues_tests.rb
+++ b/tests/rackspace/models/queues/queues_tests.rb
@@ -2,7 +2,7 @@ Shindo.tests('Fog::Rackspace::Queues | queues', ['rackspace']) do
 
   pending if Fog.mocking?
 
-  service = Fog::Rackspace::Queues.new
+  service = Fog::Rackspace::Queues.new(:rackspace_queues_client_id => 'test_client')
   options = {
     :name => "fog_instance_#{Time.now.to_i.to_s}",
   }
diff --git a/tests/rackspace/queues_tests.rb b/tests/rackspace/queues_tests.rb
index ea07ef506..dfd608aac 100644
--- a/tests/rackspace/queues_tests.rb
+++ b/tests/rackspace/queues_tests.rb
@@ -9,7 +9,7 @@ Shindo.tests('Fog::Rackspace::Queues', ['rackspace']) do
   end
 
   tests('#authentication_method') do
-    @service = Fog::Rackspace::Queues.new
+    @service = Fog::Rackspace::Queues.new(:rackspace_queues_client_id => 'test_client')
 
     assert_method nil, :authenticate_v2
 
diff --git a/tests/rackspace/requests/queues/claim_tests.rb b/tests/rackspace/requests/queues/claim_tests.rb
index 3e5f9c25b..ee63d0786 100644
--- a/tests/rackspace/requests/queues/claim_tests.rb
+++ b/tests/rackspace/requests/queues/claim_tests.rb
@@ -2,7 +2,7 @@
 
   pending if Fog.mocking?
 
-  service = Fog::Rackspace::Queues.new
+  service = Fog::Rackspace::Queues.new(:rackspace_queues_client_id => 'test_client')
 
   queue_name = 'fog' + Time.now.to_i.to_s
   client_id = 'fog-client-' + Time.now.to_i.to_s
@@ -51,7 +51,6 @@
   end
 
   tests('failure') do
-    #TODO - Escalate to queueing team
     tests("#get_claim('queue_name', 'nonexistentclaim') => Does not exist").raises(Fog::Rackspace::Queues::ServiceError) do
       service.get_claim(queue_name, 'nonexistentclaim')
     end
diff --git a/tests/rackspace/requests/queues/messages_tests.rb b/tests/rackspace/requests/queues/messages_tests.rb
index e2892af2b..11105bd6c 100644
--- a/tests/rackspace/requests/queues/messages_tests.rb
+++ b/tests/rackspace/requests/queues/messages_tests.rb
@@ -2,7 +2,7 @@ Shindo.tests('Fog::Rackspace::Queues | messages_tests', ['rackspace']) do
 
   pending if Fog.mocking?
 
-  service = Fog::Rackspace::Queues.new
+  service = Fog::Rackspace::Queues.new(:rackspace_queues_client_id => 'test_client')
 
   queue_name = 'fog' + Time.now.to_i.to_s
   client_id = 'fog-client-' + Time.now.to_i.to_s
diff --git a/tests/rackspace/requests/queues/queues_tests.rb b/tests/rackspace/requests/queues/queues_tests.rb
index 688016002..b01f353b9 100644
--- a/tests/rackspace/requests/queues/queues_tests.rb
+++ b/tests/rackspace/requests/queues/queues_tests.rb
@@ -2,7 +2,7 @@ Shindo.tests('Fog::Rackspace::Queues | queue_tests', ['rackspace']) do
 
   pending if Fog.mocking?
 
-  service = Fog::Rackspace::Queues.new
+  service = Fog::Rackspace::Queues.new(:rackspace_queues_client_id => 'test_client')
 
   tests('success') do