Also, update tests to not use underscores in group ids.
Attach a file by drag & drop or click to upload
