More test fixes.
More test fixes!