Fix some issues with failing unit tests.
2 files changed