Merge changes I7f9b2ea0,Ibb1c1d4c,I64cef032

* changes:
  Clean up run_unit_tests wordiness
  Add iterations option to run_unit_tests
  Clean up run_unit_tests a little