Merge change 1002 into donut

* changes:
  runtest.py bug fixes.