Fix rspec deprecations
Fixtures scaffolding