Improved testing; verify shuffling