Fixed unit test failures.