Rename group id
Fix test