Merge "Remove Sahara CLI tests (migrated)"