Continued to work on the test template and code generator class.  Added source to test query and etl jobs in the test yaml.