Merge "@covers tags for more test classes"