fix(+K): update to use 'on' events and add tests