more unit test fixes.