Drop generic exception handling for CLI tests

Use the specific CLIFactoryError exception when handling CLI factories exceptions

Bonus: Enable CLI Org test_bugzilla_1078866
Smart of you to collapse redundant try-catch blocks.