simplify events, add tests, bump version