Finished chapter 5. Lots of changes to rspec