refactor player and update card tests