Add test case
Add api response mapper