fix rejecting a deferred with itself
cleanup deferred tests