Pass card tests

should be an easy merge.