Unit Tests

- Upgrded to the new template.