Bug fix and test for shuffle serializer