cleaning up specs and upgrading rspec