@@ -51,7 +51,7 @@ def describe_volumes(volume_id = [])
               when 'attaching'
                 if Time.now - volume['attachmentSet'].first['attachTime'] > Fog::Mock.delay
                   volume['attachmentSet'].first['status'] = 'in-use'
-                  volume['status'] = 'in_use'
+                  volume['status'] = 'in-use'
                 end
               when 'creating'
                 if Time.now - volume['createTime'] > Fog::Mock.delay
 
@@ -27,7 +27,7 @@
     end
 
     tests("#detach_volume('#{@volume_id}')").formats(AWS::EC2::Formats::VOLUME_ATTACHMENT) do
-      AWS[:ec2].volumes.get(@volume_id).wait_for { p state; state == 'in-use' }
+      AWS[:ec2].volumes.get(@volume_id).wait_for { state == 'in-use' }
       AWS[:ec2].detach_volume(@volume_id).body
     end