Beef up test for tokenizing cards
Fix customer tests (and beef them up at the same time)