Move to rspec expect syntax

https://trello.com/c/B10UrEE2