Fixed unit test failures caused by recent commits.