Make sure to yield from
Fix tests