fixed all tests for events