Renamed card value and refactored tests