updated shuffle test for better assurance of full coverage (see #113)