Added tests for Card and changed some namespaces.