Update tests, event handlers now are public