events improved, tests cleaning