the handled_call tests are not running right now with this patch :/