bug fix: Shuffle block iterator is ignoring the shuffle serializer setting.

This was introduced when we merged Shane's shuffle change. 

I also added a unit test to make sure we can catch this bug in the future.