Command logic has no test coverage

[sjparkinson]

There's quite a lot of logic under src/Command that's not really covered by any tests.

Some good input/output tests of the cli could cover all the basic use cases and also make it really easy to refactor.