Fix template config
Fix tests