fix tests and integration for queue