Unit Tests

- Upgraded to the new template.