Midway through code clean.  CardMat unit tests expanded on