Configured rspec to include helpers, refactored tests