Fixes to template, and translator, "T".  Added some more tests.