Fix most tests on Ruby 1.8.7