Merge change 2967 into donut

* changes:
  Fixed issue where code for extracting scripts was eclipsed by runTest method.