fix tests for events merge