Fixed tests for Events