fix breaking events api test
Merge branch 'enhancements'