Update Event unit tests to match refactoring.