Miscellaneous fixes around status subcommand
Merge branch 'more-tests'

Closes #292