Added more tests for subgenerators