Replace hard-coded years with values based on the credit card expiration year.
Merge pull request #974 from boone/fix_tests

Fix tests.