Fix event unit tests