Reset the setup for rspec, correct some errors