Make it prettier
Eliminate most rspec deprecations