Some more event handlers for event logging + basic tests