Extend last change to cover TestSuites as well as TestCases.
Extend last change to cover TestSuites as well as TestCases.

sk-/python2.7-type-annotator,sk-/python2.7-type-annotator,sk-/python2.7-type-annotator