Refactor to use CmdArgs.
Turn back on all tests.