Rewrite rspec tests

Now compatible with rspec-expectations 3.0.0