LPS-34371 fix Language Keys
LPS-34371 build lang
LPS-38993 Fix Test - Only add the groupId when this is greater than 0