testing/TestCodeGeneration merge fix