Updated card defintions and tests

Removed solo card, as they are closed down.