Fixed counts when card removed from deck, and refactored test suite