[events] Fix tests & model events
[events] Clean up test