Fix match tests