Fix some normalization issues, add codegen tests