misc clean-ups
fix bug in shuffle test