Added shuffle test