Fix tests broken by templates move.