Fix more to a non-tty.

And add a test.
1 file changed