Cleaner test output

/cc @vieux