Remove old stuff
Use a prettier and more informative rspec format