Improved api track test