updated tests
Merge branch 'code_gen'