Add more unit tests to complete coverage for recent CLI work.