Fix some more unit test problems.