Some more test fixes.