Api test failures fix round1