Add missing @group and @covers tags

Change-Id: I590ebbc6585fce2a9c06920886717cefb75c021f