Fix queue cleanup in tests.