Fix failing integ tests from #277

Also updated the usage strings to be consistent with the
`<command> <subcommand>` changes.