Include event type in every user event. Add test.