Fix model templates
Some things were forgotten in the model templates after merging #9128
The failing model templates test is untrue. The second model template test (that succeeds) is true. I'll fix the github-actions YAML in a second PR.<|||||>No worries!