Expand API for usage groups, merge test license types into one.