Fix some more unit test issues.