Tweak output formatting.
Update expected test output.