various test fixes.