Change API name; add test cases