QueueManager & unit test fix