More refactoring of stub shuffler and tests