Make use of @covers tag to increase test coverage report accuracy

Change-Id: I13cfd70d5bc7651f68cc0984cb00e9ea3cf7c077
Merge "Make use of @covers tag to increase test coverage report accuracy"