Tests: fixes after the change of the file structure of the generated code