Unit Tests

- Updated to use new template.