Basic fixes to bake templates

Which the fixer can't process since they contain parse errors in their
raw format
Fix end braces in tempalte files
The fixer renamed all the class tests to match the filename

So, undo that
Correct braces in expectation