Make output close to CF compliance.
Simplify output cleanup in tests.