Fix errors in CLI refactor. Add some complete and pending specs.