Rewriting more tests as RSpec tests
Cleanup