ClientQueueTest clean up, and addedd new test

lots of clean up, and some new tests,  

testOfferPoll()  test is from original,