Fix the unit test some more.