Attempting to fix tests for Ruby 1.8.7