fixed more tests by taking out yield