Unit Tests

- Upgraded to the new template.
Unit Tests

- Changes in debug output broke a test.  Reduced string matching to make the
  tests more durable.