Switched to rspec, and other gems