Merge "Add three new CLI tests of sahara"