Fix events & provide test