modify generator
modify the test unit file
refactor the generator file