minor fixes on print format and tests