Add missing events types

Sort and space-separate event types to fix @jirutka's OCD
Extend event_type integration test