Improved CardIntegrationTest