Fixed a bunch of rspec problems, 7 left