Support return id clauses in test case