Minor test fixes.