LPS-38993 Fix Test - Only add the groupId when this is greater than 0