Adding CLI tests