Add/update CreditCard methods for consistency. Update tests