Event management refactoring
Event tests refactoring