* this is a refactoring change - no functional changes
* added missing tests
* added missing module dependency (tests found it)
* this is a prerequisite PR for future work on the card