fixing up cardtests with some of the changes i made in card. will be adding a couple of new ones next