Some cool rspec refactoring :)
Another wave of rspec refactoring