Updated Queue objects and test.