Make specs pass

This updates the tests to run with a newer rspec. Just some minor syntax & config changes.