Refactor test parameterization to resolve update timing problem.
Refactor test parameterization to resolve update timing problem.

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