Issue #12: simplification of command-line unit-test output + code cleanup