Fix tests to account for event no longer being a default type.