Testsuite: more munging for mailq output