Fix some bad @group annotations

Note that EntityContentTest is abstract.

Change-Id: Icebcc69ab1d5e37185a3b0901858b4b8b42062a7