Fixed some unit test failures.