Moved all expectations to rspec