Fix unit test failures.