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

I have not yet used GitHub for a pull request and want to use this commit to try it out. Otherwise this commit makes no sense as a PR given that I am the only contributor currently.