Small fixups in templates.
Unskip more tests and fix issues in filenames.