Fix some unit test failures.