Use newer Rspec syntax
In preparation for Rspec3