Updated default shuffling behavior for training and cross-validation