Fix unit tests to expect the new, single quotes and less wasted white-space, output.