@covers tags for unit tests

Change-Id: I2b486b38326bf23bd379efba2142034e24c0745f
Merge "@covers tags for unit tests"