some more queue cleanup before & after tests