Better spec helper
Fix rspec deprecations