Still smoking

This PR has 2 parts:
* Updated method names for ORG CLI class to match the actual command names;
* Further additions and tweaks to the CLI smoke test suite;
This type of refactoring - constant and incremental - just makes me so happy.