Fixed test cases that (I) broke by removing generator