Improve @covers tags

Change-Id: I08122a1a3c9a2faea6dbd25a2c9e1edbb07fce95