working on some updates to card and cardtest