Moved all specs to use rspec 3 syntax