Make yielded content look at the original context
Add some more tests to stress-test yield