Fix unit test failures.

Fixed unit tests failing due to code/dependency updates.
Merge remote-tracking branch 'origin/dev/sjones/unit-issues' into testing