Add more test-cases for generator utilities