Revised CLI nose tests. Updated some doctests.