Fixes shuffle/unshuffle country pref unit tests.

Shuffle method for country preferences were modified earlier. Changes the appropriate unit tests, and the corresponding unshuffle method, to work in conjunction.