rework of the gen process

improve the generation process to pass the tests