Unit Tests

- Upgraded to use the new template.