@covers tags for more test classes

Change-Id: I19d49c279646a4b4c595700e53b790ba4eb9521e
Merge "@covers tags for more test classes"