make main() clearer
merge 'hotfix-clean-cli-tests' into channeled