Rspec expect

Now that I forced you to RSpec 2.14, I converted to specs to the new syntax ;)