Merge "unify error message in TestAPI"