Many test fixes.