Merge "Properly print STDOUT and STDERR in test_wrappers"