Fix semicolons in templates and ensure test templates are generated.