DRYing cli tests and improving code coverage
Merge pull request #425 from ilyavolodin/cli

DRYing cli tests and improving code coverage