Add event tests, event validation changes