More unit test fixes.