fix up requeue error, and add tests!
Merge pull request #19 from gamechanger/dw-fix-error-queues

fix up requeue error, and add tests!