Upgrade gems, change card numbering system, fix tests