Some test fixes.