test fix and queue modification