Add handler invoking and tests