Even more test fixes for Ruby 1.8.7