improve test for events