[events] Fix tests & model events
[events] Clean up test
Merge pull request #10 from hack1337/feature/events

Feature/events