Update tests to support rspec's new syntax

As I mentioned in my previous pull request, here are the tests, ready for rspec 3.
Everything properly passing with no warnings, up to the latest version (3.1.5)