Fix more Ruby 1.8.7/test issues