fix up requeue error, and add tests!

@tleach