Fix template testing due to last changes.