Minor conflict
TestCodeGeneration starting to work again
Both lookups in TestCodeGeneration working