Fix event naming convention and add tests