Additional unit test fixes.