Finish specs for cli
Finish specs for cli
Clean up
Finish cli spec with 100% coverage