Forgot about `on`/`off` aliases. Updated tests to make sure they don't get forgotten again.
Merge branch 'events-refactor' into dev-ev-refactor