am 7322c96c: Merge change 2967 into donut

Merge commit '7322c96cc0c2524d399fb43fb406fb6324a795c8'

* commit '7322c96cc0c2524d399fb43fb406fb6324a795c8':
  Fixed issue where code for extracting scripts was eclipsed by runTest method.