Fix dispatcher warning
Caller != Calee
Update tests