change API
Add more test case