Test for early handler call + fixes