Merge "support pagination in TestAPI"