Unit Tests

- Upgraded to the new template.
CLI

- Moved ID and UUID parsing earlier in the sequence.