-Add condition in case that there is no queues defined in the configuration file.
-Add more queues to test
-fix bug