Hooking up handlers for event, moving to test