Bleeding jumbo

Some more trivial changes, which are3 more or less intended to unify the --test output of different formats.