Queuing: Improved queue cleanup unit test