remove unnecessary
add events tests