event test fix
Merge branch 'hotfix/eventtestfix'