Improved queue_items controller and testing