Clean up whitespace in specs
Fix rspec deprecation warnings