Make a couple of the tests work with Ruby 1.8 or 1.9