Fix tests after queue refactoring.