Fixing failing Rspec tests

This test suite takes entirely too long to run, but these changes
I believe should result in fixed specs.