Simplify cardsfaceup implementation and add/update tests.