more test fixes.