Finished refactoring Rspecs