Fix tests related to new Event construction API