Merge "Support endpoint type in CLI tests"