Some minor code formatting
Increase no of testcases
Merge branch 'testgenerators'