Fix tests for new events