Re-add test file shuffling.