Make the tests pass on ruby > 1.9.2