Update Event unit tests to match refactoring.
Merge branch 'akrabat-fixtests'