Make a couple of tests cope better with \r's.