Enhance tests to work with queues which don't support an expired ETA