Merge pull request #38 from cbyn/chris

Chris
fixed queue tests