Fix test failure introduced by word wrapping change.

Adds new params {output,stderr}_text that let you assert that the
output (stderr) text contains a given sequence of words (with arbitrary
whitespace in between).