Various test fixes.