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;
Word. I don't understand the full context here, but you've taken the time to take a second look at the relevant code, so I'll trust you.