refactors code in feature spec for re-shuffling queue and finishes week 3
refactors code in feature spec for re-shuffling queue and finishes week 3