Renamed shuffle to selection and added tests