modify generator and test codes