sbt changes to have CodeGeneratorTest, some fixes for CodeGenerator.