Added more tests for cards. Not finished but there is progress.