Add 'type' parameter (as 'typ') to match events. Add test for fields extracted from match events.