updated the failing test and finalized the queue refactoring