Add more event tests