Test: added more Events tests
Model: code style
Test: added more Model tests
Ignore CHANGELOG