improved test coverage and simplified some of the abstract CLI requests