Completed CardController and test refactoring.