clean up some performance and style issues
fix extra line in the generated tests
initial literal work