fix broken tests, use returns instead of yields