Moving to event-based API, temporary breaking tests