Rename print key

The standard is to use command name as the top level.
Use more concise condition
Fix failing test