Fix template deprecations
Fixtures scaffolding