Unit Tests

- Corrected unit tests, given l10n string changes.
- Upgraded to use the new template.