Use covers tags in tests

Change-Id: I3d7d248531e01f48a8500343c7ff89b69e84a005
Merge "Use covers tags in tests"