Merge "Cleanup sahara cli tests"