Fix event tests