Fix broken unit tests due to last commit on output formats.