Refactoring exiting CLI tests to use new base.

Ran 18 tests in 51.700s

OK