Refactored CardsController and specs