Added some more cli unit tests