Fix unit tests; add unit test for queue poison pill