Merge "Sahara: minor changes for API tests"