Unit Tests

- Tests now conform to template.