* Include stdout/stderr in failure messages
Sometimes some of these tests unexpectedly fail with a non-zero exit code. This ensures stdout/stderr is included in the test failure message when this happens so that we can track down the issue.
* Remove redundant info about exit code
* Remove unnecessary indenting
The [markers] make it fairly clear so this just makes the test code noisy.
0329f0c179