Switch to RSpec and cleanup stuff