Made ruby 1.8.7 change consistent for all tests