Add shuffle test