Unit Tests

- Upgraded tests to use new template.
DOM

- Preserves more original types.