Optimize a lot of card tests for new scenarios