Updated tests with new queue option