Re-factored tests.
General cleanup
Re-factoring of Card and Drawer.