Fixed unit test and change api response