DRYing cli tests and improving code coverage

Slightly drying cli tests by converting them to use sinon for stubs. Also improved coverage slightly.