Tidy up cards tests