more tests, fix for returning from break