Upgrade to RSpec 3.0

* Use `expect` syntax
Remove conditional
Don't put the type in the variable name