Extend tests for events