Fix part of events
Fix all events tests
Make structural refactoring
Fix constructor tests