Small updates to Template & its tests