fixing and improve failing events tests