Little test fixes.