fixed testing in event class
merge to the branch
properly merged