Update CApi for ajax
Edit unit test
Edit unit test