Minor init fix
queue_test and queue fixes