Refactor to test shuffling slightly better