updates cli test
merges queue_test changes
merges queue_test changes