More work on code generator schema and spec
Tests for code generator schema and clean up