Tests for refactored events
Clean-up for refactored events