add test for event_id + fix minor bugs