Fix tests, to favor yield/return