Bug fixes in generator and helper methods
Use GTimer in testsuite