Added 2 more fixes for yield+return

Also add 2 tests for yield in for and while.

But also added a new failing test for multiple yields.