At the same time, update the expected test output to match the current tools output, and write diff and ref files in /tmp.
Matthias Clasen