fix rejecting a deferred with itself
cleanup deferred tests
Merge pull request #2580 from stefanpenner/master

fix rejecting a deferred with itself