a bit more reorganization on test output