Unit Tests

- Corrected unit tests which now pass, but never did before.
Unit Tests

- Upgraded to use the new template.