[minor] Added some missing keywords
[fix] Check against index 0 instead of 1 to prevent re-shuffling. #6
[test] Adding test for shuffling.