Refactor code and tests. Rspec still won't run with 'spec,' needs full file path