Merge "add test for public api"