Further test fixes.