Queue tests and more clean-up.