clean up output and retain test tags during reruns due to timeout
Merge pull request #107 from bparees/fix_test_output

Merged by openshift-bot