Feature/2227 add tests for events