US6006: Fixinf API Tests