Cleaned up and added new test card data