Small test fixes.