Add shuffle and tests