cleanup code, more integ cli tests
Merge pull request #10 from metridoc/clean-and-more-integ-tests

cleanup code, more integ cli tests