Delayed queue fixes + tests