Merge "Add tests for registration of events with EventTypes"