Api test failures fix round2