Cards require expansions (again)
Tests, Travis, refactoring