refactoring cli tests
Merge pull request #154 from gkhachik/refactorcli

refactoring cli tests