Changing card set behavior. Making all tests pass