More robust handling of progress info when running from unit tests
p4#: 20257