Merge pull request #3 from aarondandy/dev

(PR test) improved test coverage and simplified some of the abstract CLI requests