Bleeding jumbo

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