Shuffeled cards and added more test data