Fix incorrect method names and improve @covers tags

Change-Id: I075c60fa2fe3801966d9b4e3effe20e8176b25a2
Merge "Fix incorrect method names and improve @covers tags"