Working on queue manager and unit tests