Changed to Rspec 3, finished 00