Test format_command + a little fix