Minor tweak to uncollect output

The previous method doesn't look right in all situations,
particularly parallelized testing
Merge pull request #815 from seandst/uncollect-output

Minor tweak to uncollect output