Test shuffle

Affects #15