Improved GridShuffler to be more intelligent, also improved unit test