Fixes shuffle/unshuffle country pref unit tests.
Revision
Merge pull request #69 from vishalkal/unit_tests

Fixes shuffle/unshuffle country pref unit tests.