test and queue fix