Make tests pass on both RSpec 2 and 3