Updated Card and CardTest