Tests for cli module, more tests for the client module